Merge pull request #121 from DUNE/99-u-vs-v-differences-in-certain-tr…

…uth-info-branches Restoring to before U vs V differences to vertex energy
DUNE · Jul 9, 2024 · cb3f4a7 · cb3f4a7
2 parents 98913ee + a6b1d16
commit cb3f4a7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/src/TMS_Event.cpp b/src/TMS_Event.cpp
@@ -837,8 +837,8 @@ int TMS_Event::GetVertexIdOfMostVisibleEnergy() {
     total_energy += energy;
   }
   VertexIdOfMostEnergyInEvent = max_vertex_id;
-  VisibleEnergyFromUVertexInSlice = max;
-  VisibleEnergyFromVVerticesInSlice = total_energy - max;
+  VisibleEnergyFromVertexInSlice = max;
+  VisibleEnergyFromOtherVerticesInSlice = total_energy - max;
 
   return VertexIdOfMostEnergyInEvent;
 }
@@ -867,9 +867,9 @@ void TMS_Event::Print() {
   std::cout << "  N Hits: " << TMS_Hits.size() << std::endl;
   std::cout << "  IsEmpty: " << IsEmpty() << std::endl;
   std::cout << "  Vertex ID of most energy: " << VertexIdOfMostEnergyInEvent << std::endl;
-  std::cout << "  Visible energy in slice: " << VisibleEnergyFromUVertexInSlice << std::endl;
+  std::cout << "  Visible energy in slice: " << VisibleEnergyFromVertexInSlice << std::endl;
   std::cout << "  Total visible energy: " << TotalVisibleEnergyFromVertex << std::endl;
-  std::cout << "  Other visible energy: " << VisibleEnergyFromVVerticesInSlice << std::endl;
+  std::cout << "  Other visible energy: " << VisibleEnergyFromOtherVerticesInSlice << std::endl;
 
   std::cout << "Printing primary particle stack: " << std::endl;
   int PartCount = 0;

diff --git a/src/TMS_Event.h b/src/TMS_Event.h
@@ -80,10 +80,9 @@ class TMS_Event {
 
     void SetTotalVisibleEnergyFromVertex(double energy) { TotalVisibleEnergyFromVertex = energy; };
     int GetVertexIdOfMostVisibleEnergy();
-    double GetVisibleEnergyFromUVertexInSlice() { return VisibleEnergyFromUVertexInSlice; };
+    double GetVisibleEnergyFromVertexInSlice() { return VisibleEnergyFromVertexInSlice; };
     double GetTotalVisibleEnergyFromVertex() { return TotalVisibleEnergyFromVertex; };
-    double GetVisibleEnergyFromVVerticesInSlice() { return VisibleEnergyFromVVerticesInSlice; };
-    double GetVisibleEnergyFromXVerticesInSlice() { return VisibleEnergyFromXVerticesInSlice; };
+    double GetVisibleEnergyFromOtherVerticesInSlice() { return VisibleEnergyFromOtherVerticesInSlice; };
 
     std::vector<std::pair<float, float>> GetDeadChannelPositions() { return ChannelPositions; };
     std::vector<std::pair<float, float>> GetDeadChannelTimes() { return DeadChannelTimes; };
@@ -142,10 +141,9 @@ class TMS_Event {
     std::map<int, double> TrueVisibleEnergyPerParticle;
 
     int VertexIdOfMostEnergyInEvent;
-    double VisibleEnergyFromUVertexInSlice;
+    double VisibleEnergyFromVertexInSlice;
     double TotalVisibleEnergyFromVertex;
-    double VisibleEnergyFromVVerticesInSlice;
-    double VisibleEnergyFromXVerticesInSlice;
+    double VisibleEnergyFromOtherVerticesInSlice;
 
     std::vector<std::pair<float, float>> ChannelPositions;
     std::vector<std::pair<float, float>> DeadChannelTimes;

diff --git a/src/TMS_TreeWriter.cpp b/src/TMS_TreeWriter.cpp
@@ -252,9 +252,9 @@ void TMS_TreeWriter::MakeBranches() {
   Truth_Info->Branch("Muon_TrueTrackLength", &Muon_TrueTrackLength, "Muon_TrueTrackLength/F");
 
   Truth_Info->Branch("VertexIdOfMostEnergyInEvent", &VertexIdOfMostEnergyInEvent, "VertexIdOfMostEnergyInEvent/I");
-  Truth_Info->Branch("VisibleEnergyFromUVertexInSlice", &VisibleEnergyFromUVertexInSlice, "VisibleEnergyFromUVertexInSlice/F");
+  Truth_Info->Branch("VisibleEnergyFromVertexInSlice", &VisibleEnergyFromVertexInSlice, "VisibleEnergyFromVertexInSlice/F");
   Truth_Info->Branch("TotalVisibleEnergyFromVertex", &TotalVisibleEnergyFromVertex, "TotalVisibleEnergyFromVertex/F");
-  Truth_Info->Branch("VisibleEnergyFromVVerticesInSlice", &VisibleEnergyFromVVerticesInSlice, "VisibleEnergyFromVVerticesInSlice/F");
+  Truth_Info->Branch("VisibleEnergyFromOtherVerticesInSlice", &VisibleEnergyFromOtherVerticesInSlice, "VisibleEnergyFromOtherVerticesInSlice/F");
   Truth_Info->Branch("VertexVisibleEnergyFractionInSlice", &VertexVisibleEnergyFractionInSlice, "VertexVisibleEnergyFractionInSlice/F");
   Truth_Info->Branch("PrimaryVertexVisibleEnergyFraction", &PrimaryVertexVisibleEnergyFraction, "PrimaryVertexVisibleEnergyFraction/F");
 
@@ -362,11 +362,11 @@ void TMS_TreeWriter::Fill(TMS_Event &event) {
   LeptonX4[3] = event.GetLeptonX4().T();
 
   VertexIdOfMostEnergyInEvent = event.GetVertexIdOfMostVisibleEnergy();
-  VisibleEnergyFromUVertexInSlice = event.GetVisibleEnergyFromUVertexInSlice();
+  VisibleEnergyFromVertexInSlice = event.GetVisibleEnergyFromVertexInSlice();
   TotalVisibleEnergyFromVertex = event.GetTotalVisibleEnergyFromVertex();
-  VisibleEnergyFromVVerticesInSlice = event.GetVisibleEnergyFromVVerticesInSlice();
-  VertexVisibleEnergyFractionInSlice = VisibleEnergyFromUVertexInSlice / TotalVisibleEnergyFromVertex;
-  PrimaryVertexVisibleEnergyFraction = VisibleEnergyFromUVertexInSlice / (VisibleEnergyFromVVerticesInSlice + VisibleEnergyFromUVertexInSlice);
+  VisibleEnergyFromOtherVerticesInSlice = event.GetVisibleEnergyFromOtherVerticesInSlice();
+  VertexVisibleEnergyFractionInSlice = VisibleEnergyFromVertexInSlice / TotalVisibleEnergyFromVertex;
+  PrimaryVertexVisibleEnergyFraction = VisibleEnergyFromVertexInSlice / (VisibleEnergyFromOtherVerticesInSlice + VisibleEnergyFromVertexInSlice);
 
   Muon_TrueTrackLength= event.GetMuonTrueTrackLength();
   //Muon_TrueTrackLength = -999.99;
@@ -1157,7 +1157,7 @@ void TMS_TreeWriter::Clear() {
 
   // Reset truth information
   EventNo = nParticles = NeutrinoPDG = LeptonPDG = Muon_TrueKE = Muon_TrueTrackLength = VertexIdOfMostEnergyInEvent = -999;
-  VertexIdOfMostEnergyInEvent = VisibleEnergyFromUVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromVVerticesInSlice = -999;
+  VertexIdOfMostEnergyInEvent = VisibleEnergyFromVertexInSlice = TotalVisibleEnergyFromVertex = VisibleEnergyFromOtherVerticesInSlice = -999;
   Reaction = "";
   IsCC = false;
   for (int i = 0; i < 4; ++i) {

diff --git a/src/TMS_TreeWriter.h b/src/TMS_TreeWriter.h
@@ -78,9 +78,9 @@ class TMS_TreeWriter {
     int SpillNo;
 
     int VertexIdOfMostEnergyInEvent;
-    float VisibleEnergyFromUVertexInSlice;
+    float VisibleEnergyFromVertexInSlice;
     float TotalVisibleEnergyFromVertex;
-    float VisibleEnergyFromVVerticesInSlice;
+    float VisibleEnergyFromOtherVerticesInSlice;
     float VertexVisibleEnergyFractionInSlice;
     float PrimaryVertexVisibleEnergyFraction;