Small tweaks to prepare BY2021 updates for merging - #509
Conversation
|
Can you confirm that we have not yet moved to pythia8 in the latest version and that is why we need to change the xml files to pythia6? The current installation we have is with pythia8, so we need to re-change this locally. Freddy noticed the installation with pythia6 is now rather complicated with the latest root versions available. |
|
@jtenavidal We haven't yet switched to Pythia 8 as default on the |
|
@sjgardiner The changes look good. We managed to compile with Pythia 8 following your instructions. |
| <param type="alg" name="XSecModel@genie::EventGenerator/DIS-CC"> genie::KNOTunedQPMDISPXSec/BY2021 </param> | ||
| <param type="alg" name="XSecModel@genie::EventGenerator/DIS-NC"> genie::KNOTunedQPMDISPXSec/BY2021 </param> | ||
| <param type="alg" name="XSecModel@genie::EventGenerator/DIS-EM"> genie::KNOTunedQPMDISPXSec/BY2021 </param> | ||
| --> |
There was a problem hiding this comment.
please keep the comment here
There was a problem hiding this comment.
Sure, I've restored this comment and updated the PR.
AndersenFred
left a comment
AndersenFred
left a comment
There was a problem hiding this comment.
Could you please keep our change to the ModelConfiguration?
conflicts with code already committed to the master branch. This is intended as minor cleanup for getting the BY2021 updates ready for merging ahead of tagging Generator v3.8.
…area Physics/DeepInelastic/NuclearModel. This change is intended to prevent confusion between code that manages initial-state nucleon kinematic distributions (stored in Physics/NuclearState) and code that provides nuclear corrections to DIS cross sections (stored in Physics/DeepInelastic/NuclearModel).
c897d9f to
d2eecaa
Compare
|
Done. I've restored the comment and will merge my PR into yours now. Thanks! |
3 participants
I resolved a few merge conflicts and removed some trivial, unneeded changes. I also moved the DISNuclearModelI class and its derived classes into a new area (Physics/DeepInelastic/NuclearModel) to avoid confusion with the existing nuclear models (that play a different role) in Physics/NuclearState.