Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@gpronost
Copy link
Contributor

@gpronost gpronost commented Sep 22, 2020

New version of the Radon model (will be presented at the software/physics pre-meeting this evening)

@gpronost
Copy link
Contributor Author

I did some small modifications in the code:

  • the Rn model parameter were save in a file with a timestamp in its name which is redundant with git management
  • add the Rn concentration in the fiducial volume in the debug
  • correct the value returned by GetMeanActivity() which was not the activity but the model integral
  • some minor modification in the model to make it more consistent across the different layers

@gpronost
Copy link
Contributor Author

Hi, is there any news about merging this PR?
(I changed the name since we are now at 1.9.2)

@gpronost gpronost changed the title Radon v1.9.0 Updated Radon model Nov 26, 2020
@tdealtry tdealtry self-assigned this Apr 13, 2021
Copy link
Contributor

@tdealtry tdealtry left a comment

Choose a reason for hiding this comment

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

Thanks for this @gpronost
I particularly like how you've removed a lot of constants, and replaced them with a handful of arrays

There's some specific comments inline, but a more general one is that (as a complete beginner to this) I've no idea what a lot of the variables in WCSimGenerator_Radioactivity are. So could you please document each (doxygen preferred, but not essential) in WCSimGenerator_Radioactivity.hh
Then I'll take a closer look at WCSimGenerator_Radioactivity.cc

Note that I'm going to open/close this PR to force a Travis build

@tdealtry tdealtry closed this Apr 13, 2021
@tdealtry tdealtry reopened this Apr 13, 2021
@gpronost
Copy link
Contributor Author

Hi Tom, thank you for your comments. I will try to answer them as soon as I have some time (it's been a while since I wrote this code).

@tdealtry tdealtry removed their assignment Apr 13, 2021
@gpronost gpronost requested a review from tdealtry April 15, 2021 08:26
@gpronost
Copy link
Contributor Author

I added more documentations (Not in doxygen however, I'm sorry for this).
I also modified the style of the variable names to match your criteria.

@gpronost
Copy link
Contributor Author

Last commit (d0baffd) should not have any effect, as these modifications are already on develop. I don't understand why github find difference however. If it's an issue, I will revert it.

Copy link
Contributor

@tdealtry tdealtry left a comment

Choose a reason for hiding this comment

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

Thanks for the documentation. It really helped.

I've put a few more comments inline. Additionally

  • You're using std::cout and std::endl instead of G4cout, G4err and G4endl. Can you switch to the G4 versions please? (I seem to remember a few years ago something I was doing not using the G4 versions caused some mangled printout (e.g. lines getting mixed up))
  • Can you revert the last commit (about cmake & stuff)? It is easier (if you want it in for any testing, pulling from develop should work ok, since there are no conflicts) I agree that github handles this situation badly (it maybe shows the diff between your branch and the last time you pulled from the develop branch?)

Comment on lines +152 to +153
fConcentrationID = 0;
fConcentrationFV = 0;
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm probably missing something obvious, but where are these set for scenario 0? From what I can see, "uniform" means "uniformly no radon"

Copy link
Contributor Author

@gpronost gpronost Apr 15, 2021

Choose a reason for hiding this comment

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

They are not set for scenario 0. However "uniform" doesn't means "uniformly no radon", it only means we generate radon decay randomly in the detector without following a model (with an "uniform" distribution)

double vZ [2] = { lZ , lR2 };
double vR2[2] = { lR2, lZ };
//----------------------------------//
fRnLambda_Global = par[0];
Copy link
Contributor

Choose a reason for hiding this comment

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

Again, I might be missing something, but where is par[1] used?
From the header file (and top of this file)
par[1] is the M / bin

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, indeed, it's an artifact of the old version, I removed it I think, I will change the comments.

@gpronost
Copy link
Contributor Author

I included your comments

@gpronost gpronost requested a review from tdealtry April 15, 2021 11:39
Copy link
Contributor

@tdealtry tdealtry left a comment

Choose a reason for hiding this comment

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

Wonderful. Many thanks for this @gpronost
I've just pushed a trivial change (removing the comment about par[1] in the .cc file - I couldn't do it as a suggestion on github so thought easiest thing to do it there)
Will wait for the travis to go green, then I'll merge

@tdealtry tdealtry merged commit 66b6d03 into WCSim:develop Apr 15, 2021
@gpronost gpronost deleted the Radon_v1.9.0 branch April 21, 2021 05:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants