Skip to content

Bugfix/302 assign random variation to mcs pcs life satisfaction scores#307

Merged
justin-ven merged 29 commits intodevelopfrom
bugfix/302-assign-random-variation-to-mcs-pcs-life-satisfaction-scores
Jan 28, 2026
Merged

Bugfix/302 assign random variation to mcs pcs life satisfaction scores#307
justin-ven merged 29 commits intodevelopfrom
bugfix/302-assign-random-variation-to-mcs-pcs-life-satisfaction-scores

Conversation

@andrewbaxter439
Copy link
Collaborator

Bringing in PR for comparison and checks just now, though do hold off merging until refactoring sorted.

What

  • adds expected variation to MCS, PCS, Life Satisfaction and DHE variables
  • Restricts age of mental health and wellbeing processes to over 16 (for stage 1) and 25-64 (for stage 2) in line with calculated effect estimates

Why

  • These were likely giving overly-precise mental health estimates and applying effects to wider-than-intended age groups

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@andrewbaxter439
Copy link
Collaborator Author

Hi @dav-sonn - was going to merge this as it requires some further changes to things to be built on top of it. is it suitable to merge or should I hold off until after refactoring?

This comment was marked as outdated.

@andrewbaxter439 andrewbaxter439 force-pushed the bugfix/302-assign-random-variation-to-mcs-pcs-life-satisfaction-scores branch from 20df665 to b8b552c Compare January 12, 2026 14:12
@dav-sonn
Copy link
Collaborator

Hi @dav-sonn - was going to merge this as it requires some further changes to things to be built on top of it. is it suitable to merge or should I hold off until after refactoring?

Hi @andrewbaxter439 - the refactoring is done, but I haven't merged the branch yet, as I wanted to discuss with everybody an outstanding related issue. If possible, I'd wait until tomorrow's meeting to discuss this together. Many thanks!

@andrewbaxter439
Copy link
Collaborator Author

Hi @dav-sonn - was going to merge this as it requires some further changes to things to be built on top of it. is it suitable to merge or should I hold off until after refactoring?

Hi @andrewbaxter439 - the refactoring is done, but I haven't merged the branch yet, as I wanted to discuss with everybody an outstanding related issue. If possible, I'd wait until tomorrow's meeting to discuss this together. Many thanks!

No worries, have a few things I think should be updated in this branch before merging anyway as the health module parts need some standardising and documenting. Will work on changes but hold off merging

@andrewbaxter439 andrewbaxter439 force-pushed the bugfix/302-assign-random-variation-to-mcs-pcs-life-satisfaction-scores branch from fdd5c13 to 8925d4d Compare January 12, 2026 19:56
@andrewbaxter439
Copy link
Collaborator Author

To review at meeting today @dav-sonn @justin-ven @matteorichiardi but should be ready to merge with refactoring finished. Ideally tidies up health variables to be consistent with prediction of other variables

@andrewbaxter439
Copy link
Collaborator Author

andrewbaxter439 commented Jan 27, 2026

To note: updated variable name demLifeSatScore1to7 to demLifeSatScore0to10 so will need updated in codebook!

@andrewbaxter439
Copy link
Collaborator Author

Hi @justin-ven - thanks for sorting this. Let me know if you need me to do any quick fixes my end

@justin-ven
Copy link
Contributor

Andy, I haven't been able to resolve the conflicts listed here - I think it might be worth using the "Convert to draft" option and then re-issuing the pull request.

@andrewbaxter439 andrewbaxter439 force-pushed the bugfix/302-assign-random-variation-to-mcs-pcs-life-satisfaction-scores branch from 0a27349 to baa6e9d Compare January 27, 2026 16:29
@andrewbaxter439
Copy link
Collaborator Author

Hi @justin-ven - managed to get it fixed here so good to merge I think? 👍

@justin-ven justin-ven merged commit 93ef1dd into develop Jan 28, 2026
6 checks passed
@justin-ven
Copy link
Contributor

justin-ven commented Jan 28, 2026 via email

@andrewbaxter439
Copy link
Collaborator Author

Hi Justin, managed it by using GitKraken GUI to do it and select 'prefer incoming' on each file in the merge commit. Then could run again afresh to get updated Stats files. I've looked up and there's ways of doing the 'accept all incoming changes' in the git cli which I've never used but perhaps that's the way forward: https://stackoverflow.com/questions/278081/resolving-a-git-conflict-with-binary-files

@andrewbaxter439 andrewbaxter439 deleted the bugfix/302-assign-random-variation-to-mcs-pcs-life-satisfaction-scores branch January 28, 2026 11:37
@justin-ven
Copy link
Contributor

I tried to follow the directions for using the cli, but that didn't seem to help. Will bear in mind GitKraken next time I run into difficulty.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Amend life satisfaction scores to be in range 0-10 to align with ONS use of variable

3 participants