From dc1d638ce3c6fb9a7c61e117598c71366308c213 Mon Sep 17 00:00:00 2001 From: Liam O'Sullivan Date: Thu, 18 Apr 2024 09:25:35 -0500 Subject: [PATCH 1/5] Swapped -999...s for #defined constants, including NaNs --- src/TMS_Bar.cpp | 12 +- src/TMS_Bar.h | 8 +- src/TMS_Constants.h | 4 +- src/TMS_Event.cpp | 20 +-- src/TMS_Geom.h | 4 +- src/TMS_Hit.cpp | 4 +- src/TMS_Reco.cpp | 12 +- src/TMS_Reco.h | 2 +- src/TMS_TreeWriter.cpp | 274 ++++++++++++++++++++--------------------- src/TMS_TrueHit.h | 2 +- 10 files changed, 172 insertions(+), 170 deletions(-) diff --git a/src/TMS_Bar.cpp b/src/TMS_Bar.cpp index ad9b6e4e..f7ec6448 100644 --- a/src/TMS_Bar.cpp +++ b/src/TMS_Bar.cpp @@ -107,18 +107,18 @@ bool TMS_Bar::FindModules(double xval, double yval, double zval) { // If this is a y-bar, remove the y coordinate if (BarOrient == kXBar) { - x = -99999000; + x = __TMS_NAN__; // Flip the widths double tempyw = yw; yw = xw; xw = tempyw; } else if (BarOrient == kUBar || BarOrient == kVBar || BarOrient == kYBar) { - y = -99999000; + y = __TMS_NAN__; // Don't need to flip the widths because they're already correct (yw = large, xw = 4cm) } else { - x = -99999000; - y = -99999000; - z = -99999000; + x = __TMS_NAN__; + y = __TMS_NAN__; + z = __TMS_NAN__; } // Reset the geom navigator node level in case it's used again @@ -133,7 +133,7 @@ bool TMS_Bar::FindModules(double xval, double yval, double zval) { BarNumber += 1; } } else { - BarNumber = -999; + BarNumber = __TMS_BAD_NUMBER__; } CheckBar(); diff --git a/src/TMS_Bar.h b/src/TMS_Bar.h index 6df9f445..69b7b67a 100644 --- a/src/TMS_Bar.h +++ b/src/TMS_Bar.h @@ -36,7 +36,7 @@ class TMS_Bar { else if (BarOrient == kYBar) return x; else if (BarOrient == kVBar) return x; else if (BarOrient == kUBar) return x; - return -9999999999; + return __TMS_NAN__; } double GetXw() const { return xw; }; @@ -48,7 +48,7 @@ class TMS_Bar { else if (BarOrient == kYBar) return xw; else if (BarOrient == kVBar) return xw; else if (BarOrient == kUBar) return xw; - return -9999999999; + return __TMS_NAN__; } void Print() const; @@ -73,8 +73,8 @@ class TMS_Bar { if (z > zmax || z < zmin) return false; // Now check 2D point is inside in not z - double xmin = -9999999999999; - double xmax = 9999999999999; + double xmin = __TMS_NAN__; + double xmax = __TMS_NAN__; //if (BarOrient == kXBar) { // xmin = GetY() - GetYw() / 2; // xmax = GetY() + GetYw() / 2; diff --git a/src/TMS_Constants.h b/src/TMS_Constants.h index 84f39a73..1041da0b 100644 --- a/src/TMS_Constants.h +++ b/src/TMS_Constants.h @@ -7,7 +7,9 @@ // Number of maximum particles in an edep-sim event #define __EDEP_SIM_MAX_PART__ 4000 -#define __TMS_BAD_NUMBER__ -999.99 +#define __TMS_BAD_NUMBER__ -99999999 + +#define __TMS_NAN__ std::numeric_limits::quiet_NaN() // Constants namespace TMS_KinConst { diff --git a/src/TMS_Event.cpp b/src/TMS_Event.cpp index 6a791422..aa2d3486 100644 --- a/src/TMS_Event.cpp +++ b/src/TMS_Event.cpp @@ -6,11 +6,11 @@ int TMS_Event::EventCounter = 0; TMS_Event::TMS_Event() { - EventNumber = -999; + EventNumber = __TMS_BAD_NUMBER__; SliceNumber = 0; - SpillNumber = -999; - nTrueTrajectories = -999; - VertexIdOfMostEnergyInEvent = -999; + SpillNumber = __TMS_BAD_NUMBER__; + nTrueTrajectories = __TMS_BAD_NUMBER__; + VertexIdOfMostEnergyInEvent = __TMS_BAD_NUMBER__; LightWeight = true; } @@ -41,7 +41,7 @@ TMS_Event::TMS_Event(TG4Event &event, bool FillEvent) { SliceNumber = 0; SpillNumber = EventCounter; NSlices = 1; // By default there's at least one - VertexIdOfMostEnergyInEvent = -999; + VertexIdOfMostEnergyInEvent = __TMS_BAD_NUMBER__; // Check the integrity of the event //CheckIntegrity(); @@ -192,7 +192,7 @@ TMS_Event::TMS_Event(TG4Event &event, bool FillEvent) { for (TG4HitSegmentContainer::iterator kt = tms_hits.begin(); kt != tms_hits.end(); ++kt) { TG4HitSegment edep_hit = *kt; int track_id = edep_hit.GetPrimaryId(); - int vertex_id = -999; + int vertex_id =__TMS_BAD_NUMBER__ ; auto value = mapping_track_to_vertex_id.find(track_id); if (value == mapping_track_to_vertex_id.end()) { //std::cout<<"Didn't find track id in mapping_track_to_vertex_id! track_id = "< > HoughCandsU = TMS_TrackFinder::GetFinder().GetHoughCandidatesU(); int TotalHits = TMS_TrackFinder::GetFinder().GetCleanedHits().size(); @@ -1103,10 +1103,10 @@ void TMS_TreeWriter::Fill(TMS_Event &event) { // Now fill truth info double total_true_visible_energy = 0; - double true_primary_visible_energy = -999; - double true_secondary_visible_energy = -999; - int true_primary_particle_index = -999; - int true_secondary_particle_index = -999; + double true_primary_visible_energy = __TMS_NAN__; + double true_secondary_visible_energy = __TMS_NAN__; + int true_primary_particle_index = __TMS_BAD_NUMBER__; + int true_secondary_particle_index = __TMS_BAD_NUMBER__; auto particle_info = TMS_Utils::GetPrimaryIdsByEnergy(RecoTrack->Hits); total_true_visible_energy = particle_info.total_energy; if (particle_info.energies.size() > 0) { @@ -1155,180 +1155,180 @@ void TMS_TreeWriter::Fill(TMS_Event &event) { void TMS_TreeWriter::Clear() { // Reset truth information - EventNo = nParticles = NeutrinoPDG = LeptonPDG = Muon_TrueKE = Muon_TrueTrackLength = VertexIdOfMostEnergyInEvent = -999; - VertexIdOfMostEnergyInEvent = VisibleEnergyFromUVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromVVerticesInSlice = -999; + EventNo = nParticles = NeutrinoPDG = LeptonPDG = VertexIdOfMostEnergyInEvent = VertexIdOfMostEnergyInEvent = VisibleEnergyFromUVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromVVerticesInSlice = __TMS_BAD_NUMBER__; + Muon_TrueKE = Muon_TrueTrackLength = VisibleEnergyFromUVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromVVerticesInSlice = __TMS_NAN__; Reaction = ""; IsCC = false; for (int i = 0; i < 4; ++i) { - MuonP4[i]=-999; - Muon_Vertex[i]=-999; - Muon_Death[i]=-999; - NeutrinoP4[i]=-999; - NeutrinoX4[i]=-999; - LeptonP4[i]=-999; - LeptonX4[i]=-999; + MuonP4[i]=__TMS_NAN__; + Muon_Vertex[i]=__TMS_NAN__; + Muon_Death[i]=__TMS_NAN__; + NeutrinoP4[i]=__TMS_NAN__; + NeutrinoX4[i]=__TMS_NAN__; + LeptonP4[i]=__TMS_NAN__; + LeptonX4[i]=__TMS_NAN__; } // Reset line information TMSStart = false; - nLinesU = -999; - nLinesV = -999; - nLinesX = -999; + nLinesU = __TMS_BAD_NUMBER__; + nLinesV = __TMS_BAD_NUMBER__; + nLinesX = __TMS_BAD_NUMBER__; for (int i = 0; i < __TMS_MAX_LINES__; ++i) { - SlopeU[i] = -999; - SlopeV[i] = -999; - SlopeX[i] = -999; - InterceptU[i] = -999; - InterceptV[i] = -999; - InterceptX[i] = -999; - Slope_DownstreamU[i] = -999; - Slope_DownstreamV[i] = -999; - Slope_DownstreamX[i] = -999; - Intercept_DownstreamU[i] = -999; - Intercept_DownstreamV[i] = -999; - Intercept_DownstreamX[i] = -999; - Slope_UpstreamU[i] = -999; - Slope_UpstreamV[i] = -999; - Slope_UpstreamX[i] = -999; - Intercept_UpstreamU[i] = -999; - Intercept_UpstreamV[i] = -999; - Intercept_UpstreamX[i] = -999; - - DirectionZU[i] = -999; - DirectionXU[i] = -999; - DirectionZU_Upstream[i] = -999; - DirectionXU_Upstream[i] = -999; - DirectionZU_Downstream[i] = -999; - DirectionXU_Downstream[i] = -999; - - DirectionZV[i] = -999; - DirectionXV[i] = -999; - DirectionZV_Upstream[i] = -999; - DirectionXV_Upstream[i] = -999; - DirectionZV_Downstream[i] = -999; - DirectionXV_Downstream[i] = -999; - - DirectionZX[i] = -999; - DirectionYX[i] = -999; - DirectionZX_Upstream[i] = -999; - DirectionYX_Upstream[i] = -999; - DirectionZX_Downstream[i] = -999; - DirectionYX_Downstream[i] = -999; - - OccupancyU[i] = -999; - OccupancyV[i] = -999; - OccupancyX[i] = -999; - TrackLengthU[i] = -999; - TrackLengthV[i] = -999; - TrackLengthX[i] = -999; - TotalTrackEnergyU[i] = -999; - TotalTrackEnergyV[i] = -999; - TotalTrackEnergyX[i] = -999; - FirstPlaneU[i] = -999; - FirstPlaneV[i] = -999; - FirstPlaneX[i] = -999; - LastPlaneU[i] = -999; - LastPlaneV[i] = -999; - LastPlaneX[i] = -999; - nHitsInTrackU[i] = -999; - nHitsInTrackV[i] = -999; - nHitsInTrackX[i] = -999; + SlopeU[i] = __TMS_NAN__; + SlopeV[i] = __TMS_NAN__; + SlopeX[i] = __TMS_NAN__; + InterceptU[i] = __TMS_NAN__; + InterceptV[i] = __TMS_NAN__; + InterceptX[i] = __TMS_NAN__; + Slope_DownstreamU[i] = __TMS_NAN__; + Slope_DownstreamV[i] = __TMS_NAN__; + Slope_DownstreamX[i] = __TMS_NAN__; + Intercept_DownstreamU[i] = __TMS_NAN__; + Intercept_DownstreamV[i] = __TMS_NAN__; + Intercept_DownstreamX[i] = __TMS_NAN__; + Slope_UpstreamU[i] = __TMS_NAN__; + Slope_UpstreamV[i] = __TMS_NAN__; + Slope_UpstreamX[i] = __TMS_NAN__; + Intercept_UpstreamU[i] = __TMS_NAN__; + Intercept_UpstreamV[i] = __TMS_NAN__; + Intercept_UpstreamX[i] = __TMS_NAN__; + + DirectionZU[i] = __TMS_NAN__; + DirectionXU[i] = __TMS_NAN__; + DirectionZU_Upstream[i] = __TMS_NAN__; + DirectionXU_Upstream[i] = __TMS_NAN__; + DirectionZU_Downstream[i] = __TMS_NAN__; + DirectionXU_Downstream[i] = __TMS_NAN__; + + DirectionZV[i] = __TMS_NAN__; + DirectionXV[i] = __TMS_NAN__; + DirectionZV_Upstream[i] = __TMS_NAN__; + DirectionXV_Upstream[i] = __TMS_NAN__; + DirectionZV_Downstream[i] = __TMS_NAN__; + DirectionXV_Downstream[i] = __TMS_NAN__; + + DirectionZX[i] = __TMS_NAN__; + DirectionYX[i] = __TMS_NAN__; + DirectionZX_Upstream[i] = __TMS_NAN__; + DirectionYX_Upstream[i] = __TMS_NAN__; + DirectionZX_Downstream[i] = __TMS_NAN__; + DirectionYX_Downstream[i] = __TMS_NAN__; + + OccupancyU[i] = __TMS_NAN__; + OccupancyV[i] = __TMS_NAN__; + OccupancyX[i] = __TMS_NAN__; + TrackLengthU[i] = __TMS_NAN__; + TrackLengthV[i] = __TMS_NAN__; + TrackLengthX[i] = __TMS_NAN__; + TotalTrackEnergyU[i] = __TMS_NAN__; + TotalTrackEnergyV[i] = __TMS_NAN__; + TotalTrackEnergyX[i] = __TMS_NAN__; + FirstPlaneU[i] = __TMS_NAN__; + FirstPlaneV[i] = __TMS_NAN__; + FirstPlaneX[i] = __TMS_NAN__; + LastPlaneU[i] = __TMS_NAN__; + LastPlaneV[i] = __TMS_NAN__; + LastPlaneX[i] = __TMS_NAN__; + nHitsInTrackU[i] = __TMS_BAD_NUMBER__; + nHitsInTrackV[i] = __TMS_BAD_NUMBER__; + nHitsInTrackX[i] = __TMS_BAD_NUMBER__; TrackStoppingU[i] = false; TrackStoppingV[i] = false; TrackStoppingX[i] = false; } -/* Occupancy3D[i] = -999; - TrackLength3D[i] = -999; - TotalTrackEnergy3D[i] = -999; - FirstPlane3D[i] = -999; - LastPlane3D[i] = -999; - nHitsInTrack3D[i] = -999; +/* Occupancy3D[i] = __TMS_NAN__; + TrackLength3D[i] = __TMS_NAN__; + TotalTrackEnergy3D[i] = __TMS_NAN__; + FirstPlane3D[i] = __TMS_NAN__; + LastPlane3D[i] = __TMS_NAN__; + nHitsInTrack3D[i] = __TMS_NAN__; TrackStopping3D[i] = false; for (int j = 0; j < 2; ++j) { - FirstHitOne[i][j] = -999; - FirstHitOther[i][j] = -999; - LastHitOne[i][j] = -999; - LastHitOther[i][j] = -999; + FirstHitOne[i][j] = __TMS_NAN__; + FirstHitOther[i][j] = __TMS_NAN__; + LastHitOne[i][j] = __TMS_NAN__; + LastHitOther[i][j] = __TMS_NAN__; } for (int j = 0; j < 3; ++j) { - FirstHit3D[i][j] = -999; - LastHit3D[i][j] = -999; + FirstHit3D[i][j] = __TMS_NAN__; + LastHit3D[i][j] = __TMS_NAN__; } for (int j = 0; j < __TMS_MAX_LINE_HITS__; ++j) { - TrackHitEnergyOne[i][j]=-999; - TrackHitEnergyOther[i][j]=-999; - TrackHitPosOne[i][j][0]=-999; - TrackHitPosOne[i][j][1]=-999; - TrackHitPosOther[i][j][0]=-999; - TrackHitPosOther[i][j][1]=-999; - - TrackHitEnergy3D[i][j] = -999; - TrackHitPos3D[i][j][0] = -999; - TrackHitPos3D[i][j][1] = -999; - TrackHitPos3D[i][j][2] = -999; + TrackHitEnergyOne[i][j]=__TMS_NAN__; + TrackHitEnergyOther[i][j]=__TMS_NAN__; + TrackHitPosOne[i][j][0]=__TMS_NAN__; + TrackHitPosOne[i][j][1]=__TMS_NAN__; + TrackHitPosOther[i][j][0]=__TMS_NAN__; + TrackHitPosOther[i][j][1]=__TMS_NAN__; + + TrackHitEnergy3D[i][j] = __TMS_NAN__; + TrackHitPos3D[i][j][0] = __TMS_NAN__; + TrackHitPos3D[i][j][1] = __TMS_NAN__; + TrackHitPos3D[i][j][2] = __TMS_NAN__; } }*/ // Reset hit information - nHits = -999; + nHits = __TMS_BAD_NUMBER__; for (int i = 0; i < __TMS_MAX_HITS__; ++i) { - for (int j = 0; j < 4; ++j) RecoHitPos[i][j] = -999; - RecoHitEnergy[i] = -999; + for (int j = 0; j < 4; ++j) RecoHitPos[i][j] = __TMS_NAN__; + RecoHitEnergy[i] = __TMS_NAN__; } // Reset Cluster info - nClustersU = -999; - nClustersV = -999; - nClustersX = -999; + nClustersU = __TMS_BAD_NUMBER__; + nClustersV = __TMS_BAD_NUMBER__; + nClustersX = __TMS_BAD_NUMBER__; for (int i = 0; i < __TMS_MAX_CLUSTERS__; ++i) { - ClusterEnergyU[i] = -999; - ClusterEnergyV[i] = -999; - ClusterEnergyX[i] = -999; - nHitsInClusterU[i] = -999; - nHitsInClusterV[i] = -999; - nHitsInClusterX[i] = -999; + ClusterEnergyU[i] = __TMS_NAN__; + ClusterEnergyV[i] = __TMS_NAN__; + ClusterEnergyX[i] = __TMS_NAN__; + nHitsInClusterU[i] = __TMS_BAD_NUMBER__; + nHitsInClusterV[i] = __TMS_BAD_NUMBER__; + nHitsInClusterX[i] = __TMS_BAD_NUMBER__; for (int j = 0; j < 2; ++j) { - ClusterPosMeanU[i][j] = -999; - ClusterPosStdDevU[i][j] = -999; + ClusterPosMeanU[i][j] = __TMS_NAN__; + ClusterPosStdDevU[i][j] = __TMS_NAN__; - ClusterPosMeanV[i][j] = -999; - ClusterPosStdDevV[i][j] = -999; + ClusterPosMeanV[i][j] = __TMS_NAN__; + ClusterPosStdDevV[i][j] = __TMS_NAN__; - ClusterPosMeanX[i][j] = -999; - ClusterPosStdDevX[i][j] = -999; + ClusterPosMeanX[i][j] = __TMS_NAN__; + ClusterPosStdDevX[i][j] = __TMS_NAN__; } for (int j = 0; j < __TMS_MAX_LINE_HITS__; ++j) { - ClusterHitPosU[i][j][0] = -999; - ClusterHitPosU[i][j][1] = -999; - ClusterHitEnergyU[i][j] = -999; + ClusterHitPosU[i][j][0] = __TMS_NAN__; + ClusterHitPosU[i][j][1] = __TMS_NAN__; + ClusterHitEnergyU[i][j] = __TMS_NAN__; - ClusterHitPosV[i][j][0] = -999; - ClusterHitPosV[i][j][1] = -999; - ClusterHitEnergyV[i][j] = -999; + ClusterHitPosV[i][j][0] = __TMS_NAN__; + ClusterHitPosV[i][j][1] = __TMS_NAN__; + ClusterHitEnergyV[i][j] = __TMS_NAN__; - ClusterHitPosX[i][j][0] = -999; - ClusterHitPosX[i][j][1] = -999; - ClusterHitEnergyX[i][j] = -999; + ClusterHitPosX[i][j][0] = __TMS_NAN__; + ClusterHitPosX[i][j][1] = __TMS_NAN__; + ClusterHitEnergyX[i][j] = __TMS_NAN__; } } // Reset track information - nTracks = -999; + nTracks = __TMS_BAD_NUMBER__; for (int i = 0; i < __TMS_MAX_TRACKS__; ++i) { for (int j = 0; j < 3; ++j) { - RecoTrackStartPos[i][j] = -999; - RecoTrackDirection[i][j] = -999; - RecoTrackEndPos[i][j] = -999; + RecoTrackStartPos[i][j] = __TMS_NAN__; + RecoTrackDirection[i][j] = __TMS_NAN__; + RecoTrackEndPos[i][j] = __TMS_NAN__; } for (int k = 0; k < __TMS_MAX_LINE_HITS__; ++k) { - RecoTrackHitPos[i][k][0] = -999; - RecoTrackHitPos[i][k][1] = -999; - RecoTrackHitPos[i][k][2] = -999; + RecoTrackHitPos[i][k][0] = __TMS_NAN__; + RecoTrackHitPos[i][k][1] = __TMS_NAN__; + RecoTrackHitPos[i][k][2] = __TMS_NAN__; } - RecoTrackEnergyRange[i] = -999; - RecoTrackEnergyDeposit[i] = -999; - RecoTrackLength[i] = -999; + RecoTrackEnergyRange[i] = __TMS_NAN__; + RecoTrackEnergyDeposit[i] = __TMS_NAN__; + RecoTrackLength[i] = __TMS_NAN__; } diff --git a/src/TMS_TrueHit.h b/src/TMS_TrueHit.h index 2a1a938e..908c271a 100644 --- a/src/TMS_TrueHit.h +++ b/src/TMS_TrueHit.h @@ -90,7 +90,7 @@ class TMS_TrueHit { int GetPrimaryId() const { return PrimaryIds.at(0); }; int GetVertexId() const { if (VertexIds.size() == 1) return VertexIds.at(0); - else if (VertexIds.size() == 0) return -999; + else if (VertexIds.size() == 0) return __TMS_BAD_NUMBER__; std::cout<<"Fatal: Using GetVertexId with > 1 possible VertexId. Use GetVertexIds instead."< Date: Fri, 19 Apr 2024 06:05:16 -0500 Subject: [PATCH 2/5] Replaced bad NaN definition with normal one --- src/TMS_Bar.cpp | 10 +- src/TMS_Bar.h | 8 +- src/TMS_Constants.h | 2 - src/TMS_Hit.cpp | 4 +- src/TMS_Reco.cpp | 12 +-- src/TMS_TreeWriter.cpp | 240 ++++++++++++++++++++--------------------- 6 files changed, 137 insertions(+), 139 deletions(-) diff --git a/src/TMS_Bar.cpp b/src/TMS_Bar.cpp index f7ec6448..1e379586 100644 --- a/src/TMS_Bar.cpp +++ b/src/TMS_Bar.cpp @@ -107,18 +107,18 @@ bool TMS_Bar::FindModules(double xval, double yval, double zval) { // If this is a y-bar, remove the y coordinate if (BarOrient == kXBar) { - x = __TMS_NAN__; + x = NAN; // Flip the widths double tempyw = yw; yw = xw; xw = tempyw; } else if (BarOrient == kUBar || BarOrient == kVBar || BarOrient == kYBar) { - y = __TMS_NAN__; + y = NAN; // Don't need to flip the widths because they're already correct (yw = large, xw = 4cm) } else { - x = __TMS_NAN__; - y = __TMS_NAN__; - z = __TMS_NAN__; + x = NAN; + y = NAN; + z = NAN; } // Reset the geom navigator node level in case it's used again diff --git a/src/TMS_Bar.h b/src/TMS_Bar.h index 69b7b67a..be01b727 100644 --- a/src/TMS_Bar.h +++ b/src/TMS_Bar.h @@ -36,7 +36,7 @@ class TMS_Bar { else if (BarOrient == kYBar) return x; else if (BarOrient == kVBar) return x; else if (BarOrient == kUBar) return x; - return __TMS_NAN__; + return NAN; } double GetXw() const { return xw; }; @@ -48,7 +48,7 @@ class TMS_Bar { else if (BarOrient == kYBar) return xw; else if (BarOrient == kVBar) return xw; else if (BarOrient == kUBar) return xw; - return __TMS_NAN__; + return NAN; } void Print() const; @@ -73,8 +73,8 @@ class TMS_Bar { if (z > zmax || z < zmin) return false; // Now check 2D point is inside in not z - double xmin = __TMS_NAN__; - double xmax = __TMS_NAN__; + double xmin = NAN; + double xmax = NAN; //if (BarOrient == kXBar) { // xmin = GetY() - GetYw() / 2; // xmax = GetY() + GetYw() / 2; diff --git a/src/TMS_Constants.h b/src/TMS_Constants.h index 1041da0b..720c12d9 100644 --- a/src/TMS_Constants.h +++ b/src/TMS_Constants.h @@ -9,8 +9,6 @@ #define __TMS_BAD_NUMBER__ -99999999 -#define __TMS_NAN__ std::numeric_limits::quiet_NaN() - // Constants namespace TMS_KinConst { const double mass_mu = 105.6583755; // Muon mass in MeV/c2 diff --git a/src/TMS_Hit.cpp b/src/TMS_Hit.cpp index e1b0f4a0..e76f5191 100644 --- a/src/TMS_Hit.cpp +++ b/src/TMS_Hit.cpp @@ -12,8 +12,8 @@ TMS_Hit::TMS_Hit(TG4HitSegment &edep_seg, int vertex_id) : Time((edep_seg.GetStop().T()+edep_seg.GetStart().T())/2), Slice(0), #ifdef RECORD_HIT_DEADTIME - DeadtimeStart(__TMS_NAN__), - DeadtimeStop(__TMS_NAN__), + DeadtimeStart(NAN), + DeadtimeStop(NAN), #endif PedSuppressed(false), PE(edep_seg.GetEnergyDeposit() * TMS_Readout_Manager::GetInstance().Get_Sim_Optical_LightYield()) { diff --git a/src/TMS_Reco.cpp b/src/TMS_Reco.cpp index 03de85cd..3dbb354e 100644 --- a/src/TMS_Reco.cpp +++ b/src/TMS_Reco.cpp @@ -1289,7 +1289,7 @@ void TMS_TrackFinder::EvaluateTrackFinding(TMS_Event &event) { // Calculate the total track energy double TMS_TrackFinder::CalculateTrackEnergy(const std::vector &Candidate) { // Look at the reconstructred tracks - if (Candidate.size() == 0) return __TMS_NAN__; + if (Candidate.size() == 0) return NAN; // Sort by increasing z //std::sort((*Candidate).begin(), (*Candidate).end(), TMS_Hit::SortByZInc); @@ -1304,7 +1304,7 @@ double TMS_TrackFinder::CalculateTrackEnergy(const std::vector &Candida double TMS_TrackFinder::CalculateTrackEnergy3D(const TMS_Track &Track3D) { // Look at the reconstructed tracks - if ((Track3D.Hits).size() == 0) return __TMS_NAN__; + if ((Track3D.Hits).size() == 0) return NAN; double total = 0; // Loop over each Hough Candidate and find the track energy @@ -1315,7 +1315,7 @@ double TMS_TrackFinder::CalculateTrackEnergy3D(const TMS_Track &Track3D) { } double TMS_TrackFinder::CalculateTrackKEByRange(const TMS_Track &Track3D) { - if (Track3D.Length <= 0.0) return __TMS_NAN__; + if (Track3D.Length <= 0.0) return NAN; return 82. + 1.75*Track3D.Length; // Magic Clarence number } @@ -1323,7 +1323,7 @@ double TMS_TrackFinder::CalculateTrackKEByRange(const TMS_Track &Track3D) { // Calculate the track length for each track double TMS_TrackFinder::CalculateTrackLength(const std::vector &Candidate) { // Look at the reconstructed track - if (Candidate.size() == 0) return __TMS_NAN__; + if (Candidate.size() == 0) return NAN; double final_total = 0; int max_n_nodes_used = 0; @@ -1361,7 +1361,7 @@ double TMS_TrackFinder::CalculateTrackLength(const std::vector &Candida double TMS_TrackFinder::CalculateTrackLength3D(const TMS_Track &Track3D) { // Look at the reconstructed tracks - if ((Track3D.Hits).size() == 0) return __TMS_NAN__; + if ((Track3D.Hits).size() == 0) return NAN; double final_total = 0; int max_n_nodes_used = 0; @@ -1859,7 +1859,7 @@ std::vector TMS_TrackFinder::RunHough(const std::vector &TMS_H } // Calculate 'x'-point of hit with Hough line - double HoughPoint = __TMS_NAN__; //HoughLineOne->Eval(zhit); + double HoughPoint = NAN; //HoughLineOne->Eval(zhit); if (hitgroup == 'U') { HoughPoint = HoughLineU->Eval(zhit); } else if (hitgroup == 'V') { diff --git a/src/TMS_TreeWriter.cpp b/src/TMS_TreeWriter.cpp index 38605e83..57827f3d 100644 --- a/src/TMS_TreeWriter.cpp +++ b/src/TMS_TreeWriter.cpp @@ -311,7 +311,7 @@ void TMS_TreeWriter::MakeBranches() { Truth_Info->Branch("PositionZIsTMSEnd", PositionZIsTMSEnd, "PositionZIsTMSEnd[nTrueParticles][4]/F"); } -static void setMomentum(float *branch, TVector3 momentum, double energy = __TMS_NAN__) { +static void setMomentum(float *branch, TVector3 momentum, double energy = NAN) { branch[0] = momentum.X(); branch[1] = momentum.Y(); branch[2] = momentum.Z(); @@ -369,7 +369,7 @@ void TMS_TreeWriter::Fill(TMS_Event &event) { PrimaryVertexVisibleEnergyFraction = VisibleEnergyFromUVertexInSlice / (VisibleEnergyFromVVerticesInSlice + VisibleEnergyFromUVertexInSlice); //Muon_TrueTrackLength= event.GetMuonTrueTrackLength(); - Muon_TrueTrackLength = __TMS_NAN__; + Muon_TrueTrackLength = NAN; //std::cout << Muon_TrueTrackLength << std::endl; Muon_TrueKE = event.GetMuonTrueKE(); @@ -624,7 +624,7 @@ void TMS_TreeWriter::Fill(TMS_Event &event) { // Find where the first hough hit is TMSStart = false; - TMSStartTime = __TMS_NAN__; + TMSStartTime = NAN; std::vector > HoughCandsU = TMS_TrackFinder::GetFinder().GetHoughCandidatesU(); int TotalHits = TMS_TrackFinder::GetFinder().GetCleanedHits().size(); @@ -1103,8 +1103,8 @@ void TMS_TreeWriter::Fill(TMS_Event &event) { // Now fill truth info double total_true_visible_energy = 0; - double true_primary_visible_energy = __TMS_NAN__; - double true_secondary_visible_energy = __TMS_NAN__; + double true_primary_visible_energy = NAN; + double true_secondary_visible_energy = NAN; int true_primary_particle_index = __TMS_BAD_NUMBER__; int true_secondary_particle_index = __TMS_BAD_NUMBER__; auto particle_info = TMS_Utils::GetPrimaryIdsByEnergy(RecoTrack->Hits); @@ -1156,17 +1156,17 @@ void TMS_TreeWriter::Clear() { // Reset truth information EventNo = nParticles = NeutrinoPDG = LeptonPDG = VertexIdOfMostEnergyInEvent = VertexIdOfMostEnergyInEvent = VisibleEnergyFromUVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromVVerticesInSlice = __TMS_BAD_NUMBER__; - Muon_TrueKE = Muon_TrueTrackLength = VisibleEnergyFromUVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromVVerticesInSlice = __TMS_NAN__; + Muon_TrueKE = Muon_TrueTrackLength = VisibleEnergyFromUVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromVVerticesInSlice = NAN; Reaction = ""; IsCC = false; for (int i = 0; i < 4; ++i) { - MuonP4[i]=__TMS_NAN__; - Muon_Vertex[i]=__TMS_NAN__; - Muon_Death[i]=__TMS_NAN__; - NeutrinoP4[i]=__TMS_NAN__; - NeutrinoX4[i]=__TMS_NAN__; - LeptonP4[i]=__TMS_NAN__; - LeptonX4[i]=__TMS_NAN__; + MuonP4[i]=NAN; + Muon_Vertex[i]=NAN; + Muon_Death[i]=NAN; + NeutrinoP4[i]=NAN; + NeutrinoX4[i]=NAN; + LeptonP4[i]=NAN; + LeptonX4[i]=NAN; } // Reset line information @@ -1175,61 +1175,61 @@ void TMS_TreeWriter::Clear() { nLinesV = __TMS_BAD_NUMBER__; nLinesX = __TMS_BAD_NUMBER__; for (int i = 0; i < __TMS_MAX_LINES__; ++i) { - SlopeU[i] = __TMS_NAN__; - SlopeV[i] = __TMS_NAN__; - SlopeX[i] = __TMS_NAN__; - InterceptU[i] = __TMS_NAN__; - InterceptV[i] = __TMS_NAN__; - InterceptX[i] = __TMS_NAN__; - Slope_DownstreamU[i] = __TMS_NAN__; - Slope_DownstreamV[i] = __TMS_NAN__; - Slope_DownstreamX[i] = __TMS_NAN__; - Intercept_DownstreamU[i] = __TMS_NAN__; - Intercept_DownstreamV[i] = __TMS_NAN__; - Intercept_DownstreamX[i] = __TMS_NAN__; - Slope_UpstreamU[i] = __TMS_NAN__; - Slope_UpstreamV[i] = __TMS_NAN__; - Slope_UpstreamX[i] = __TMS_NAN__; - Intercept_UpstreamU[i] = __TMS_NAN__; - Intercept_UpstreamV[i] = __TMS_NAN__; - Intercept_UpstreamX[i] = __TMS_NAN__; - - DirectionZU[i] = __TMS_NAN__; - DirectionXU[i] = __TMS_NAN__; - DirectionZU_Upstream[i] = __TMS_NAN__; - DirectionXU_Upstream[i] = __TMS_NAN__; - DirectionZU_Downstream[i] = __TMS_NAN__; - DirectionXU_Downstream[i] = __TMS_NAN__; - - DirectionZV[i] = __TMS_NAN__; - DirectionXV[i] = __TMS_NAN__; - DirectionZV_Upstream[i] = __TMS_NAN__; - DirectionXV_Upstream[i] = __TMS_NAN__; - DirectionZV_Downstream[i] = __TMS_NAN__; - DirectionXV_Downstream[i] = __TMS_NAN__; - - DirectionZX[i] = __TMS_NAN__; - DirectionYX[i] = __TMS_NAN__; - DirectionZX_Upstream[i] = __TMS_NAN__; - DirectionYX_Upstream[i] = __TMS_NAN__; - DirectionZX_Downstream[i] = __TMS_NAN__; - DirectionYX_Downstream[i] = __TMS_NAN__; - - OccupancyU[i] = __TMS_NAN__; - OccupancyV[i] = __TMS_NAN__; - OccupancyX[i] = __TMS_NAN__; - TrackLengthU[i] = __TMS_NAN__; - TrackLengthV[i] = __TMS_NAN__; - TrackLengthX[i] = __TMS_NAN__; - TotalTrackEnergyU[i] = __TMS_NAN__; - TotalTrackEnergyV[i] = __TMS_NAN__; - TotalTrackEnergyX[i] = __TMS_NAN__; - FirstPlaneU[i] = __TMS_NAN__; - FirstPlaneV[i] = __TMS_NAN__; - FirstPlaneX[i] = __TMS_NAN__; - LastPlaneU[i] = __TMS_NAN__; - LastPlaneV[i] = __TMS_NAN__; - LastPlaneX[i] = __TMS_NAN__; + SlopeU[i] = NAN; + SlopeV[i] = NAN; + SlopeX[i] = NAN; + InterceptU[i] = NAN; + InterceptV[i] = NAN; + InterceptX[i] = NAN; + Slope_DownstreamU[i] = NAN; + Slope_DownstreamV[i] = NAN; + Slope_DownstreamX[i] = NAN; + Intercept_DownstreamU[i] = NAN; + Intercept_DownstreamV[i] = NAN; + Intercept_DownstreamX[i] = NAN; + Slope_UpstreamU[i] = NAN; + Slope_UpstreamV[i] = NAN; + Slope_UpstreamX[i] = NAN; + Intercept_UpstreamU[i] = NAN; + Intercept_UpstreamV[i] = NAN; + Intercept_UpstreamX[i] = NAN; + + DirectionZU[i] = NAN; + DirectionXU[i] = NAN; + DirectionZU_Upstream[i] = NAN; + DirectionXU_Upstream[i] = NAN; + DirectionZU_Downstream[i] = NAN; + DirectionXU_Downstream[i] = NAN; + + DirectionZV[i] = NAN; + DirectionXV[i] = NAN; + DirectionZV_Upstream[i] = NAN; + DirectionXV_Upstream[i] = NAN; + DirectionZV_Downstream[i] = NAN; + DirectionXV_Downstream[i] = NAN; + + DirectionZX[i] = NAN; + DirectionYX[i] = NAN; + DirectionZX_Upstream[i] = NAN; + DirectionYX_Upstream[i] = NAN; + DirectionZX_Downstream[i] = NAN; + DirectionYX_Downstream[i] = NAN; + + OccupancyU[i] = NAN; + OccupancyV[i] = NAN; + OccupancyX[i] = NAN; + TrackLengthU[i] = NAN; + TrackLengthV[i] = NAN; + TrackLengthX[i] = NAN; + TotalTrackEnergyU[i] = NAN; + TotalTrackEnergyV[i] = NAN; + TotalTrackEnergyX[i] = NAN; + FirstPlaneU[i] = __TMS_BAD_NUMBER__; + FirstPlaneV[i] = __TMS_BAD_NUMBER__; + FirstPlaneX[i] = __TMS_BAD_NUMBER__; + LastPlaneU[i] = __TMS_BAD_NUMBER__; + LastPlaneV[i] = __TMS_BAD_NUMBER__; + LastPlaneX[i] = __TMS_BAD_NUMBER__; nHitsInTrackU[i] = __TMS_BAD_NUMBER__; nHitsInTrackV[i] = __TMS_BAD_NUMBER__; nHitsInTrackX[i] = __TMS_BAD_NUMBER__; @@ -1237,44 +1237,44 @@ void TMS_TreeWriter::Clear() { TrackStoppingV[i] = false; TrackStoppingX[i] = false; } -/* Occupancy3D[i] = __TMS_NAN__; - TrackLength3D[i] = __TMS_NAN__; - TotalTrackEnergy3D[i] = __TMS_NAN__; - FirstPlane3D[i] = __TMS_NAN__; - LastPlane3D[i] = __TMS_NAN__; - nHitsInTrack3D[i] = __TMS_NAN__; +/* Occupancy3D[i] = NAN; + TrackLength3D[i] = NAN; + TotalTrackEnergy3D[i] = NAN; + FirstPlane3D[i] = NAN; + LastPlane3D[i] = NAN; + nHitsInTrack3D[i] = NAN; TrackStopping3D[i] = false; for (int j = 0; j < 2; ++j) { - FirstHitOne[i][j] = __TMS_NAN__; - FirstHitOther[i][j] = __TMS_NAN__; - LastHitOne[i][j] = __TMS_NAN__; - LastHitOther[i][j] = __TMS_NAN__; + FirstHitOne[i][j] = NAN; + FirstHitOther[i][j] = NAN; + LastHitOne[i][j] = NAN; + LastHitOther[i][j] = NAN; } for (int j = 0; j < 3; ++j) { - FirstHit3D[i][j] = __TMS_NAN__; - LastHit3D[i][j] = __TMS_NAN__; + FirstHit3D[i][j] = NAN; + LastHit3D[i][j] = NAN; } for (int j = 0; j < __TMS_MAX_LINE_HITS__; ++j) { - TrackHitEnergyOne[i][j]=__TMS_NAN__; - TrackHitEnergyOther[i][j]=__TMS_NAN__; - TrackHitPosOne[i][j][0]=__TMS_NAN__; - TrackHitPosOne[i][j][1]=__TMS_NAN__; - TrackHitPosOther[i][j][0]=__TMS_NAN__; - TrackHitPosOther[i][j][1]=__TMS_NAN__; - - TrackHitEnergy3D[i][j] = __TMS_NAN__; - TrackHitPos3D[i][j][0] = __TMS_NAN__; - TrackHitPos3D[i][j][1] = __TMS_NAN__; - TrackHitPos3D[i][j][2] = __TMS_NAN__; + TrackHitEnergyOne[i][j]=NAN; + TrackHitEnergyOther[i][j]=NAN; + TrackHitPosOne[i][j][0]=NAN; + TrackHitPosOne[i][j][1]=NAN; + TrackHitPosOther[i][j][0]=NAN; + TrackHitPosOther[i][j][1]=NAN; + + TrackHitEnergy3D[i][j] = NAN; + TrackHitPos3D[i][j][0] = NAN; + TrackHitPos3D[i][j][1] = NAN; + TrackHitPos3D[i][j][2] = NAN; } }*/ // Reset hit information nHits = __TMS_BAD_NUMBER__; for (int i = 0; i < __TMS_MAX_HITS__; ++i) { - for (int j = 0; j < 4; ++j) RecoHitPos[i][j] = __TMS_NAN__; - RecoHitEnergy[i] = __TMS_NAN__; + for (int j = 0; j < 4; ++j) RecoHitPos[i][j] = NAN; + RecoHitEnergy[i] = NAN; } // Reset Cluster info @@ -1282,34 +1282,34 @@ void TMS_TreeWriter::Clear() { nClustersV = __TMS_BAD_NUMBER__; nClustersX = __TMS_BAD_NUMBER__; for (int i = 0; i < __TMS_MAX_CLUSTERS__; ++i) { - ClusterEnergyU[i] = __TMS_NAN__; - ClusterEnergyV[i] = __TMS_NAN__; - ClusterEnergyX[i] = __TMS_NAN__; + ClusterEnergyU[i] = NAN; + ClusterEnergyV[i] = NAN; + ClusterEnergyX[i] = NAN; nHitsInClusterU[i] = __TMS_BAD_NUMBER__; nHitsInClusterV[i] = __TMS_BAD_NUMBER__; nHitsInClusterX[i] = __TMS_BAD_NUMBER__; for (int j = 0; j < 2; ++j) { - ClusterPosMeanU[i][j] = __TMS_NAN__; - ClusterPosStdDevU[i][j] = __TMS_NAN__; + ClusterPosMeanU[i][j] = NAN; + ClusterPosStdDevU[i][j] = NAN; - ClusterPosMeanV[i][j] = __TMS_NAN__; - ClusterPosStdDevV[i][j] = __TMS_NAN__; + ClusterPosMeanV[i][j] = NAN; + ClusterPosStdDevV[i][j] = NAN; - ClusterPosMeanX[i][j] = __TMS_NAN__; - ClusterPosStdDevX[i][j] = __TMS_NAN__; + ClusterPosMeanX[i][j] = NAN; + ClusterPosStdDevX[i][j] = NAN; } for (int j = 0; j < __TMS_MAX_LINE_HITS__; ++j) { - ClusterHitPosU[i][j][0] = __TMS_NAN__; - ClusterHitPosU[i][j][1] = __TMS_NAN__; - ClusterHitEnergyU[i][j] = __TMS_NAN__; + ClusterHitPosU[i][j][0] = NAN; + ClusterHitPosU[i][j][1] = NAN; + ClusterHitEnergyU[i][j] = NAN; - ClusterHitPosV[i][j][0] = __TMS_NAN__; - ClusterHitPosV[i][j][1] = __TMS_NAN__; - ClusterHitEnergyV[i][j] = __TMS_NAN__; + ClusterHitPosV[i][j][0] = NAN; + ClusterHitPosV[i][j][1] = NAN; + ClusterHitEnergyV[i][j] = NAN; - ClusterHitPosX[i][j][0] = __TMS_NAN__; - ClusterHitPosX[i][j][1] = __TMS_NAN__; - ClusterHitEnergyX[i][j] = __TMS_NAN__; + ClusterHitPosX[i][j][0] = NAN; + ClusterHitPosX[i][j][1] = NAN; + ClusterHitEnergyX[i][j] = NAN; } } @@ -1317,18 +1317,18 @@ void TMS_TreeWriter::Clear() { nTracks = __TMS_BAD_NUMBER__; for (int i = 0; i < __TMS_MAX_TRACKS__; ++i) { for (int j = 0; j < 3; ++j) { - RecoTrackStartPos[i][j] = __TMS_NAN__; - RecoTrackDirection[i][j] = __TMS_NAN__; - RecoTrackEndPos[i][j] = __TMS_NAN__; + RecoTrackStartPos[i][j] = NAN; + RecoTrackDirection[i][j] = NAN; + RecoTrackEndPos[i][j] = NAN; } for (int k = 0; k < __TMS_MAX_LINE_HITS__; ++k) { - RecoTrackHitPos[i][k][0] = __TMS_NAN__; - RecoTrackHitPos[i][k][1] = __TMS_NAN__; - RecoTrackHitPos[i][k][2] = __TMS_NAN__; + RecoTrackHitPos[i][k][0] = NAN; + RecoTrackHitPos[i][k][1] = NAN; + RecoTrackHitPos[i][k][2] = NAN; } - RecoTrackEnergyRange[i] = __TMS_NAN__; - RecoTrackEnergyDeposit[i] = __TMS_NAN__; - RecoTrackLength[i] = __TMS_NAN__; + RecoTrackEnergyRange[i] = NAN; + RecoTrackEnergyDeposit[i] = NAN; + RecoTrackLength[i] = NAN; } From b2da568508f02b1592adeb383acca910e6b3172d Mon Sep 17 00:00:00 2001 From: Liam O'Sullivan Date: Fri, 19 Apr 2024 08:59:55 -0500 Subject: [PATCH 3/5] add units as comments in header --- src/TMS_Track.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/TMS_Track.h b/src/TMS_Track.h index c6a7dcf6..daa06f28 100644 --- a/src/TMS_Track.h +++ b/src/TMS_Track.h @@ -15,17 +15,17 @@ class TMS_Track { void Print(); int Charge; - double Start[3]; // Start point in x,y,z - double End[3]; // End point in x,y,z + double Start[3]; // Start point in x,y,z, in mm + double End[3]; // End point in x,y,z, in mm double Direction[3]; // Unit vector in track direction - double Length; + double Length; // in mm double Occupancy; - double EnergyDeposit; - double EnergyRange; + double EnergyDeposit;// MeV + double EnergyRange; // MeV double Time; // TODO: Fill this in a sensible way - double GetEnergyDeposit(){return EnergyDeposit;}; - double GetEnergyRange(){return EnergyRange;}; + double GetEnergyDeposit(){return EnergyDeposit;}; // MeV + double GetEnergyRange(){return EnergyRange;}; // MeV int nHits; std::vector Hits; From 4297be94963dc5b9e387d20e3b25cc28b0a189b5 Mon Sep 17 00:00:00 2001 From: Liam O'Sullivan Date: Tue, 14 May 2024 11:10:59 -0500 Subject: [PATCH 4/5] __TMS_BAD_NUMBER__ is now __TMS_BAD_INT__ --- src/TMS_Bar.cpp | 2 +- src/TMS_Constants.h | 2 +- src/TMS_Geom.h | 4 ++-- src/TMS_Reco.h | 2 +- src/TMS_TreeWriter.cpp | 46 +++++++++++++++++++++--------------------- src/TMS_TrueHit.h | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/TMS_Bar.cpp b/src/TMS_Bar.cpp index 1e379586..be3f1bcd 100644 --- a/src/TMS_Bar.cpp +++ b/src/TMS_Bar.cpp @@ -133,7 +133,7 @@ bool TMS_Bar::FindModules(double xval, double yval, double zval) { BarNumber += 1; } } else { - BarNumber = __TMS_BAD_NUMBER__; + BarNumber = __TMS_BAD_INT__; } CheckBar(); diff --git a/src/TMS_Constants.h b/src/TMS_Constants.h index 720c12d9..2f56906b 100644 --- a/src/TMS_Constants.h +++ b/src/TMS_Constants.h @@ -7,7 +7,7 @@ // Number of maximum particles in an edep-sim event #define __EDEP_SIM_MAX_PART__ 4000 -#define __TMS_BAD_NUMBER__ -99999999 +#define __TMS_BAD_INT__ -99999999 // Constants namespace TMS_KinConst { diff --git a/src/TMS_Geom.h b/src/TMS_Geom.h index 3926381f..6ebb7776 100644 --- a/src/TMS_Geom.h +++ b/src/TMS_Geom.h @@ -460,7 +460,7 @@ class TMS_Geom { while (step < Unscale(__GEOM_LARGE_STEP__) && target_dist-dist > 0) { // Plane, bar, global int *Plane = new int[3]; - for (int i = 0; i < 3; ++i) Plane[i] = __TMS_BAD_NUMBER__; + for (int i = 0; i < 3; ++i) Plane[i] = __TMS_BAD_INT__; std::string NodeName = std::string(geom->GetCurrentNode()->GetName()); const double *pt = geom->GetCurrentPoint(); @@ -502,7 +502,7 @@ class TMS_Geom { } // Don't push back if we're missing info; likely means the volume wasn't a scintillator bar - if (Plane[0] == __TMS_BAD_NUMBER__|| Plane[1] == __TMS_BAD_NUMBER__|| Plane[2] == __TMS_BAD_NUMBER__) continue; + if (Plane[0] == __TMS_BAD_INT__|| Plane[1] == __TMS_BAD_INT__|| Plane[2] == __TMS_BAD_INT__) continue; // Push back the information std::pair temp(Plane, Scale(pt_vec)); diff --git a/src/TMS_Reco.h b/src/TMS_Reco.h index b1006a2c..3bf1965f 100644 --- a/src/TMS_Reco.h +++ b/src/TMS_Reco.h @@ -51,7 +51,7 @@ class aNode { //aNode(double xval, double yval, double ywval): aNode(double xval, double yval) : x(xval), y(yval), - HeuristicCost(__LARGE_COST__), NodeID(__TMS_BAD_NUMBER__), + HeuristicCost(__LARGE_COST__), NodeID(__TMS_BAD_INT__), //Heuristic(kManhattan) { // what calculator Heuristic(HeuristicType::kEuclidean) { // what calculator }; diff --git a/src/TMS_TreeWriter.cpp b/src/TMS_TreeWriter.cpp index 3fd92766..88407d5e 100644 --- a/src/TMS_TreeWriter.cpp +++ b/src/TMS_TreeWriter.cpp @@ -1104,8 +1104,8 @@ void TMS_TreeWriter::Fill(TMS_Event &event) { double total_true_visible_energy = 0; double true_primary_visible_energy = NAN; double true_secondary_visible_energy = NAN; - int true_primary_particle_index = __TMS_BAD_NUMBER__; - int true_secondary_particle_index = __TMS_BAD_NUMBER__; + int true_primary_particle_index = __TMS_BAD_INT__; + int true_secondary_particle_index = __TMS_BAD_INT__; auto particle_info = TMS_Utils::GetPrimaryIdsByEnergy(RecoTrack->Hits); total_true_visible_energy = particle_info.total_energy; if (particle_info.energies.size() > 0) { @@ -1155,7 +1155,7 @@ void TMS_TreeWriter::Fill(TMS_Event &event) { void TMS_TreeWriter::Clear() { // Reset truth information - EventNo = nParticles = NeutrinoPDG = LeptonPDG = VertexIdOfMostEnergyInEvent = VertexIdOfMostEnergyInEvent = VisibleEnergyFromUVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromVVerticesInSlice = __TMS_BAD_NUMBER__; + EventNo = nParticles = NeutrinoPDG = LeptonPDG = VertexIdOfMostEnergyInEvent = VertexIdOfMostEnergyInEvent = VisibleEnergyFromUVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromVVerticesInSlice = __TMS_BAD_INT__; Muon_TrueKE = Muon_TrueTrackLength = VisibleEnergyFromUVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromVVerticesInSlice = NAN; Reaction = ""; IsCC = false; @@ -1171,9 +1171,9 @@ void TMS_TreeWriter::Clear() { // Reset line information TMSStart = false; - nLinesU = __TMS_BAD_NUMBER__; - nLinesV = __TMS_BAD_NUMBER__; - nLinesX = __TMS_BAD_NUMBER__; + nLinesU = __TMS_BAD_INT__; + nLinesV = __TMS_BAD_INT__; + nLinesX = __TMS_BAD_INT__; for (int i = 0; i < __TMS_MAX_LINES__; ++i) { SlopeU[i] = NAN; SlopeV[i] = NAN; @@ -1224,15 +1224,15 @@ void TMS_TreeWriter::Clear() { TotalTrackEnergyU[i] = NAN; TotalTrackEnergyV[i] = NAN; TotalTrackEnergyX[i] = NAN; - FirstPlaneU[i] = __TMS_BAD_NUMBER__; - FirstPlaneV[i] = __TMS_BAD_NUMBER__; - FirstPlaneX[i] = __TMS_BAD_NUMBER__; - LastPlaneU[i] = __TMS_BAD_NUMBER__; - LastPlaneV[i] = __TMS_BAD_NUMBER__; - LastPlaneX[i] = __TMS_BAD_NUMBER__; - nHitsInTrackU[i] = __TMS_BAD_NUMBER__; - nHitsInTrackV[i] = __TMS_BAD_NUMBER__; - nHitsInTrackX[i] = __TMS_BAD_NUMBER__; + FirstPlaneU[i] = __TMS_BAD_INT__; + FirstPlaneV[i] = __TMS_BAD_INT__; + FirstPlaneX[i] = __TMS_BAD_INT__; + LastPlaneU[i] = __TMS_BAD_INT__; + LastPlaneV[i] = __TMS_BAD_INT__; + LastPlaneX[i] = __TMS_BAD_INT__; + nHitsInTrackU[i] = __TMS_BAD_INT__; + nHitsInTrackV[i] = __TMS_BAD_INT__; + nHitsInTrackX[i] = __TMS_BAD_INT__; TrackStoppingU[i] = false; TrackStoppingV[i] = false; TrackStoppingX[i] = false; @@ -1271,23 +1271,23 @@ void TMS_TreeWriter::Clear() { }*/ // Reset hit information - nHits = __TMS_BAD_NUMBER__; + nHits = __TMS_BAD_INT__; for (int i = 0; i < __TMS_MAX_HITS__; ++i) { for (int j = 0; j < 4; ++j) RecoHitPos[i][j] = NAN; RecoHitEnergy[i] = NAN; } // Reset Cluster info - nClustersU = __TMS_BAD_NUMBER__; - nClustersV = __TMS_BAD_NUMBER__; - nClustersX = __TMS_BAD_NUMBER__; + nClustersU = __TMS_BAD_INT__; + nClustersV = __TMS_BAD_INT__; + nClustersX = __TMS_BAD_INT__; for (int i = 0; i < __TMS_MAX_CLUSTERS__; ++i) { ClusterEnergyU[i] = NAN; ClusterEnergyV[i] = NAN; ClusterEnergyX[i] = NAN; - nHitsInClusterU[i] = __TMS_BAD_NUMBER__; - nHitsInClusterV[i] = __TMS_BAD_NUMBER__; - nHitsInClusterX[i] = __TMS_BAD_NUMBER__; + nHitsInClusterU[i] = __TMS_BAD_INT__; + nHitsInClusterV[i] = __TMS_BAD_INT__; + nHitsInClusterX[i] = __TMS_BAD_INT__; for (int j = 0; j < 2; ++j) { ClusterPosMeanU[i][j] = NAN; ClusterPosStdDevU[i][j] = NAN; @@ -1314,7 +1314,7 @@ void TMS_TreeWriter::Clear() { } // Reset track information - nTracks = __TMS_BAD_NUMBER__; + nTracks = __TMS_BAD_INT__; for (int i = 0; i < __TMS_MAX_TRACKS__; ++i) { for (int j = 0; j < 3; ++j) { RecoTrackStartPos[i][j] = NAN; diff --git a/src/TMS_TrueHit.h b/src/TMS_TrueHit.h index 908c271a..824c365e 100644 --- a/src/TMS_TrueHit.h +++ b/src/TMS_TrueHit.h @@ -90,7 +90,7 @@ class TMS_TrueHit { int GetPrimaryId() const { return PrimaryIds.at(0); }; int GetVertexId() const { if (VertexIds.size() == 1) return VertexIds.at(0); - else if (VertexIds.size() == 0) return __TMS_BAD_NUMBER__; + else if (VertexIds.size() == 0) return __TMS_BAD_INT__; std::cout<<"Fatal: Using GetVertexId with > 1 possible VertexId. Use GetVertexIds instead."< Date: Tue, 14 May 2024 11:16:25 -0500 Subject: [PATCH 5/5] __TMS_BAD_NUMBER__ is now __TMS_BAD_INT__ --- src/TMS_Event.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/TMS_Event.cpp b/src/TMS_Event.cpp index aa2d3486..f514c3ca 100644 --- a/src/TMS_Event.cpp +++ b/src/TMS_Event.cpp @@ -6,11 +6,11 @@ int TMS_Event::EventCounter = 0; TMS_Event::TMS_Event() { - EventNumber = __TMS_BAD_NUMBER__; + EventNumber = __TMS_BAD_INT__; SliceNumber = 0; - SpillNumber = __TMS_BAD_NUMBER__; - nTrueTrajectories = __TMS_BAD_NUMBER__; - VertexIdOfMostEnergyInEvent = __TMS_BAD_NUMBER__; + SpillNumber = __TMS_BAD_INT__; + nTrueTrajectories = __TMS_BAD_INT__; + VertexIdOfMostEnergyInEvent = __TMS_BAD_INT__; LightWeight = true; } @@ -41,7 +41,7 @@ TMS_Event::TMS_Event(TG4Event &event, bool FillEvent) { SliceNumber = 0; SpillNumber = EventCounter; NSlices = 1; // By default there's at least one - VertexIdOfMostEnergyInEvent = __TMS_BAD_NUMBER__; + VertexIdOfMostEnergyInEvent = __TMS_BAD_INT__; // Check the integrity of the event //CheckIntegrity(); @@ -192,7 +192,7 @@ TMS_Event::TMS_Event(TG4Event &event, bool FillEvent) { for (TG4HitSegmentContainer::iterator kt = tms_hits.begin(); kt != tms_hits.end(); ++kt) { TG4HitSegment edep_hit = *kt; int track_id = edep_hit.GetPrimaryId(); - int vertex_id =__TMS_BAD_NUMBER__ ; + int vertex_id =__TMS_BAD_INT__ ; auto value = mapping_track_to_vertex_id.find(track_id); if (value == mapping_track_to_vertex_id.end()) { //std::cout<<"Didn't find track id in mapping_track_to_vertex_id! track_id = "<