Dev/d meson #74
Dev/d meson #74
Conversation
There was a problem hiding this comment.
looks good, just need to remove some debug printouts and a few files that are used for analysis of d meson events. I will merge after testing this locally, but @austinschneider feel free to take a look and leave comments if you would like
There was a problem hiding this comment.
@nickkamp1 be sure to update this when you merge your HNL branch
projects/distributions/private/secondary/vertex/SecondaryBoundedVertexDistribution.cxx
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
@nickkamp1 update with the HNL PR
python/SIREN_Controller.py
Outdated
There was a problem hiding this comment.
@nickkamp1 verify that SaveWeighter works
|
Made changes! made request of new round of review, please check if the changes are made |
|
I'm starting to take a look now. I'll provide detailed comments sometime today :) |
|
It is not clear to me that we need this In the way that it has been implemented here, can't the hadronization process just be implemented as a new decay process with |
|
Regardless of if we keep the |
| @@ -683,7 +683,7 @@ double DetectorModel::GetInteractionDensity(Geometry::IntersectionList const & i | |||
| std::vector<double> const & total_cross_sections, | |||
| double const & total_decay_length) const { | |||
| Vector3D direction = p0 - intersections.position; | |||
| if(direction.magnitude() == 0) { | |||
| if(direction.magnitude() == 0 || direction.magnitude() <= 1e-5) { | |||
There was a problem hiding this comment.
| if(direction.magnitude() == 0 || direction.magnitude() <= 1e-5) { | |
| // Check that direction is approximately zero | |
| if(direction.magnitude() <= 1e-5) { |
There was a problem hiding this comment.
Was there a specific issue that the distance.magnitude() <= 1e-5 checks fixed?
I'm wondering if there is another underlying issue that this is covering up, or if we really need this fix.
There was a problem hiding this comment.
For the direction.magnitude() <= 1e-5 checks, you should put the 1e-5 constant into the projects/detector/public/SIREN/detector/DetectorModel.h header
class DetectorModel {
public:
constexpr static double distance_threshold = 1e-5;and then use this constant to perform the checks in the .cxx file.
| if(distance == 0.0) { | ||
| return 0.0; | ||
| } | ||
| if(direction.magnitude() <= 1e-5) { | ||
| direction = intersections.direction; | ||
| // return 1e-05; // I have to do this to ensure that it works | ||
| } |
There was a problem hiding this comment.
| if(distance == 0.0) { | |
| return 0.0; | |
| } | |
| if(direction.magnitude() <= 1e-5) { | |
| direction = intersections.direction; | |
| // return 1e-05; // I have to do this to ensure that it works | |
| } | |
| if(direction.magnitude() <= 1e-5) { | |
| return 0.0; | |
| } |
There was a problem hiding this comment.
Instead of adding special login in this class checks for a hadronization interaction to change the class behavior, you should implement a new secondary vertex distribution that has the appropriate behavior for hadronization.
| @@ -12,6 +12,8 @@ | |||
| #include "SIREN/interactions/DarkNewsCrossSection.h" | |||
| #include "SIREN/interactions/InteractionCollection.h" | |||
| #include "SIREN/interactions/Decay.h" | |||
| #include "SIREN/interactions/Hadronization.h" | |||
|
|
|||
| @@ -22,6 +22,8 @@ | |||
|
|
|||
| #include "SIREN/interactions/CrossSection.h" | |||
| #include "SIREN/interactions/Decay.h" | |||
| #include "SIREN/interactions/Hadronization.h" | |||
|
|
|||
| @@ -23,6 +23,8 @@ | |||
| #include "SIREN/interactions/InteractionCollection.h" | |||
| #include "SIREN/interactions/CrossSection.h" | |||
| #include "SIREN/interactions/Decay.h" | |||
| #include "SIREN/interactions/Hadronization.h" | |||
|
|
|||
| @@ -23,6 +23,8 @@ | |||
| #include "SIREN/interactions/InteractionCollection.h" | |||
| #include "SIREN/interactions/CrossSection.h" | |||
| #include "SIREN/interactions/Decay.h" | |||
| #include "SIREN/interactions/Hadronization.h" | |||
|
|
|||
| @@ -21,6 +21,8 @@ | |||
| #include "SIREN/interactions/InteractionCollection.h" | |||
| #include "SIREN/interactions/CrossSection.h" | |||
| #include "SIREN/interactions/Decay.h" | |||
| #include "SIREN/interactions/Hadronization.h" | |||
|
|
|||
No description provided.