Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure simpoints default of 200 in all programs like lims #158

Merged
merged 2 commits into from
Dec 5, 2024

Conversation

doluk
Copy link
Collaborator

@doluk doluk commented Nov 22, 2024

No description provided.

@doluk doluk requested a review from demeler November 22, 2024 10:26
@demeler
Copy link
Collaborator

demeler commented Nov 22, 2024

Have you checked 2DSA, PCSA and GA to make sure they also use the same simulation numbers when generating models?

Copy link
Collaborator

@demeler demeler left a comment

Choose a reason for hiding this comment

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

Checked the changed files. Please also make sure they are consistent with the fitting programs on the desktop and on the remote LIMS that generate the methods.

@doluk
Copy link
Collaborator Author

doluk commented Nov 22, 2024

Have you checked 2DSA, PCSA and GA to make sure they also use the same simulation numbers when generating models?

I checked the 2DSA one with multiple models. I had no PCSA and GA model at hand, because the Konstanz instance is out of disk. But at the end this is always a setting the user can change in the advanced dialog, we are just changing the default

@demeler
Copy link
Collaborator

demeler commented Nov 22, 2024 via email

@doluk
Copy link
Collaborator Author

doluk commented Nov 27, 2024

us_astfem_sim uses 200

simparams.simpoints = 200; // Initialized number of radial grid points

us_mwl_species_sim uses 200
simparams.simpoints = 200; // Initialized number of radial grid points

Programs relying on the data loader from US_AnalysisBase2 uses 200 (us_2dsa, us_pcsa) (the simparameters of the datasets are initialized while loading, but simparams.simpoints never gets overwritten)
simpoints = 200;

us_autoflow_analysis uses 200
adv_vals[ "simpoints" ] = "200";

us_fematch uses now 200
adv_vals[ "simpoints" ] = "200";

us_reporter uses now 200
adv_vals[ "simpoints" ] = "200";

us_mpi_analysis relies on the job file generated by lims
if ( xml.name() == "simpoints" )

LIMS uses 200 as default (the slider created in the linked code is used in 2DSA, PCSA, DMGA, 2DSA-CG and GA) https://github.com/ehb54/us3lims_dbinst/blob/0271f107f11e72e8780e08cbd0b57fbe077a892b/lib/controls.php#L135

@doluk
Copy link
Collaborator Author

doluk commented Nov 27, 2024

@demeler I haven't found any other usage of simpoints or initialization of something with 500 (But I didn't search for any other number except 200 and 500)

merge master into lukas-bug-388
@ehb54 ehb54 self-requested a review November 28, 2024 23:03
Copy link
Owner

@ehb54 ehb54 left a comment

Choose a reason for hiding this comment

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

Code changes seem fine, approved.

@ehb54 ehb54 requested a review from demeler November 28, 2024 23:08
Copy link
Collaborator

@demeler demeler left a comment

Choose a reason for hiding this comment

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

Did a quick test on demeler9 - running a 2DSA model on usiab-node0 and displaying it in the us_fematch module. Checking the RMSD levels from both systems provided identical RMSDs (2DSA remote):
Residual RMS Deviation:
0.00459557
Model-reported RMSD:
0.00459557

Observed the same for the local 2DSA:
Residual RMS Deviation:
0.00463817
Model-reported RMSD:
0.00463817

Also ran a PCSA (remote):
Residual RMS Deviation:
0.00455346
Model-reported RMSD:
0.00455346

PCSA (local):

Residual RMS Deviation:
0.00454871
Model-reported RMSD:
0.00454871

and a GA model (remote):

Residual RMS Deviation:
0.0045777
Model-reported RMSD:
0.00457197

Only the GA method showed a minor difference in the model RMSD. It's probably OK, but we should check why. The GA is not part of the GMP package.

@doluk
Copy link
Collaborator Author

doluk commented Nov 29, 2024

I tested the 2DSA with MC, where it still deviates sometimes with the MC stuff. But this is now something purely with MC. The first MC single gives the same value. But we know this already
For me GA worked fine.
Residual RMS Deviation:
0.0164342
Model-reported RMSD:
0.0164342

@demeler
Copy link
Collaborator

demeler commented Nov 29, 2024 via email

@doluk
Copy link
Collaborator Author

doluk commented Nov 29, 2024 via email

@ehb54 ehb54 merged commit a8f4a9f into master Dec 5, 2024
5 checks passed
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.

3 participants