adding rev tot effective offset for time walk calib

kkacprzak · Mar 15, 2024 · 449d997 · 449d997
1 parent 03bdcba
commit 449d997
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -175,10 +175,10 @@ endif()
 ################################################################################
 ## Directories with examples
 add_subdirectory(ModularDetectorAnalysis)
-add_subdirectory(ListmodeExport)
-add_subdirectory(MCGeantAnalysis)
-add_subdirectory(RedModuleAnalysis)
-add_subdirectory(opsAnalysis)
+#add_subdirectory(ListmodeExport)
+#add_subdirectory(MCGeantAnalysis)
+#add_subdirectory(RedModuleAnalysis)
+#add_subdirectory(opsAnalysis)
 #add_subdirectory(Imaging)
 #add_subdirectory(InterfileReconstruction)
 #add_subdirectory(LargeBarrelAnalysis)

diff --git a/ListmodeExport/main.cpp b/ListmodeExport/main.cpp
@@ -13,9 +13,14 @@
  *  @file main.cpp
  */
 
-#include <JPetManager/JPetManager.h>
-#include "EventCategorizer.h"
+#include "../ModularDetectorAnalysis/EventCategorizer.h"
+#include "../ModularDetectorAnalysis/EventFinder.h"
+#include "../ModularDetectorAnalysis/HitFinder.h"
+#include "../ModularDetectorAnalysis/SignalFinder.h"
+#include "../ModularDetectorAnalysis/SignalTransformer.h"
+#include "../ModularDetectorAnalysis/TimeWindowCreator.h"
 #include "ConvertEvents.h"
+#include <JPetManager/JPetManager.h>
 
 using namespace std;
 
@@ -25,11 +30,21 @@ int main(int argc, const char* argv[])
   {
     JPetManager& manager = JPetManager::getManager();
 
+    manager.registerTask<TimeWindowCreator>("TimeWindowCreator");
+    manager.registerTask<SignalFinder>("SignalFinder");
+    manager.registerTask<SignalTransformer>("SignalTransformer");
+    manager.registerTask<HitFinder>("HitFinder");
+    manager.registerTask<EventFinder>("EventFinder");
     manager.registerTask<EventCategorizer>("EventCategorizer");
     manager.registerTask<ConvertEvents>("ConvertEvents");
-
+
+    manager.useTask("TimeWindowCreator", "hld", "tslot.calib");
+    manager.useTask("SignalFinder", "tslot.calib", "raw.sig");
+    manager.useTask("SignalTransformer", "raw.sig", "phys.sig");
+    manager.useTask("HitFinder", "phys.sig", "hits");
+    manager.useTask("EventFinder", "hits", "unk.evt");
     manager.useTask("EventCategorizer", "unk.evt", "cat.evt");
-    manager.useTask("ConvertEvents", "cat.evt", "dummy");
+    manager.useTask("ConvertEvents", "cat.evt", "lor");
 
     manager.run(argc, argv);
   }

diff --git a/ModularDetectorAnalysis/CalibrationTools.cpp b/ModularDetectorAnalysis/CalibrationTools.cpp
@@ -144,6 +144,12 @@ void CalibrationTools::selectForTimeWalk(const JPetEvent& event, JPetStatistics&
         auto revToT1 = calculateReveresedToT(firstHit);
         auto revToT2 = calculateReveresedToT(secondHit);
 
+        double revToT1Offset = calibTree.get("scin." + to_string(firstHit->getScin().getID()) + ".rev_tot", 0.0);
+        double revToT2Offset = calibTree.get("scin." + to_string(secondHit->getScin().getID()) + ".rev_tot", 0.0);
+
+        revToT1 -= revToT1Offset;
+        revToT2 -= revToT2Offset;
+
         // A-B time difference vs. time walk effect
         stats.fillHistogram("time_walk_ab_tdiff", firstHit->getTimeDiff(), revToT1);
         stats.fillHistogram("time_walk_ab_tdiff", secondHit->getTimeDiff(), revToT2);

diff --git a/ModularDetectorAnalysis/EventCategorizer.cpp b/ModularDetectorAnalysis/EventCategorizer.cpp
@@ -303,6 +303,8 @@ bool EventCategorizer::exec()
                                                             fToTCutAnniMax, fSourcePos, fTestType, fScatterTOFTimeDiff, fScatterTimeMin,
                                                             fScatterTimeMax, fScatterAngleMin, fScatterAngleMax, fConstansTree);
 
+      bool is3Gamma = EventCategorizerTools::checkFor3Gamma(event, getStatistics(), fSaveControlHistos);
+
       bool isLifetime2Gamma = EventCategorizerTools::checkFor3GammaLifetime(
           event, getStatistics(), fSaveControlHistos, f2gThetaDiff, f2gTimeDiff, fToTCutAnniMin, fToTCutAnniMax, fToTCutDeexMin, fToTCutDeexMax,
           fSourcePos, fTestType, fScatterTOFTimeDiff, fScatterTimeMin, fScatterTimeMax, fScatterAngleMin, fScatterAngleMax, fConstansTree);