Feature dune v1.1 develop #11
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ub:/MaCh3-Software/CUDAProb3 using OscClass are different than github:/dbarrow257/CUDAProb - Needs further investigation
…o atmospherics
…le lives in configs and anything not-configurable lives in inputs
…asses since POT isn't required for atmospherics
…y base classes or not intended to be used as one
…E into feature_DUNE_v1.1_develop Dan's changes to the executables and other things
…samplePDF objects
dbarrow257
reviewed
Oct 16, 2024
| NDDetectorSystPointers = std::vector<const double*>(nNDDetectorSystPointers); | ||
|
|
||
| int func_it = 0; | ||
| for (std::vector<int>::iterator it = funcParsIndex.begin(); it != funcParsIndex.end(); ++it, ++func_it) { |
There was a problem hiding this comment.
why are we using manual iterators in 2024?
for(auto const &fpi : funcParsIndex){
//...would be nice
There was a problem hiding this comment.
oh, I guess you want the enumeration index too,
for(int func_it = 0; func_it < nNDDetectorSystPointers; ++func_it){
auto const & fpi = funcParsIndex[func_it]; // or just use the full thing, iterators are confusing...|
|
||
| int samplePDFDUNEBeamFD::setupExperimentMC(int iSample) { | ||
| const char *sampleFile = (mtuple_files[iSample]).c_str(); | ||
| dunemc_base *duneobj = &(dunemcSamples[iSample]); |
There was a problem hiding this comment.
its fairly minor, but this is just unnecessary. We really can do without any bare pointers in most of this code:
auto &duneobj = dunemcSamples[iSample];
//...
duneobj.bla[i] = _bla;
dbarrow257
reviewed
Oct 17, 2024
luketpickering
approved these changes
Oct 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changing the DUNE code to be up to date with a new version of the core code. The version of the core code is currently being reviewed but will be release as a 2.0.0 tag.
The main changes consist of changing the constructor of the samplePDFFD object to take a lot of the information from the sample yaml file. This reduces the amount of code that need to be written in each samplePDFDune object.
We now also use the NuOscillator object to calculate oscillation probabilities in the core code.
The samplePDF objects in DUNE have also been slightly renamed to no longer include the word "base" in them as they are not intended to be base classes.
Lots of files have also been removed to reduce the clutter. A few additional exes will be added shortly for people to use as clear examples. There is also a "factory" method to initialise the different samplePDF instances meaning that a lot of executables can now be shared across the beam and atmoshperic samples.