[TEST] checksimG3/G4 testing with new patch

Detectors/TPC/simulation/src/Detector.cxx

@@ -142,9 +142,29 @@ Bool_t Detector::ProcessHits(FairVolume* vol)
   // TODO: Temporary hack to process only one sector
   // if (sectorID != 0) return kFALSE;
 
+  // ---| momentum and beta gamma |---
+  static TLorentzVector momentum; // static to make avoid creation/deletion of this expensive object
+  fMC->TrackMomentum(momentum);
+
+  const float time = fMC->TrackTime() * 1.0e9;
+  const int trackID = fMC->GetStack()->GetCurrentTrackNumber();
+  const int detID = vol->getMCid();
+  o2::data::Stack* stack = (o2::data::Stack*)fMC->GetStack();
+  if (fMC->IsTrackEntering() || fMC->IsTrackExiting()) {
+    stack->addTrackReference(o2::TrackReference(position.X(), position.Y(), position.Z(), momentum.X(), momentum.Y(),
+                                                momentum.Z(), fMC->TrackLength(), time, trackID, GetDetId()));
+    lastReferenceR = fMC->TrackLength();
+  }
+  if (TMath::Abs(lastReferenceR - fMC->TrackLength()) > kMaxDistRef) { /// we can speedup
+    stack->addTrackReference(o2::TrackReference(position.X(), position.Y(), position.Z(), momentum.X(), momentum.Y(),
+                                                momentum.Z(), fMC->TrackLength(), time, trackID, GetDetId()));
+    lastReferenceR = fMC->TrackLength();
+  }
+
   // ---| remove clusters between the IFC and the FC strips |---
   // those should not enter the active readout area
   // do coarse selection before, to limit number of transformations
+
   if (detParam.ExcludeFCGap) {
     const auto rCluster = std::sqrt(position.X() * position.X() + position.Y() * position.Y());
     const float rodRin = 81.5 + 2.2;    // radial position of the inner field cage rods + radial size of the field cage rods
@@ -164,24 +184,6 @@ Bool_t Detector::ProcessHits(FairVolume* vol)
     }
   }
 
-  // ---| momentum and beta gamma |---
-  static TLorentzVector momentum; // static to make avoid creation/deletion of this expensive object
-  fMC->TrackMomentum(momentum);
-
-  const float time = fMC->TrackTime() * 1.0e9;
-  const int trackID = fMC->GetStack()->GetCurrentTrackNumber();
-  const int detID = vol->getMCid();
-  o2::data::Stack* stack = (o2::data::Stack*)fMC->GetStack();
-  if (fMC->IsTrackEntering() || fMC->IsTrackExiting()) {
-    stack->addTrackReference(o2::TrackReference(position.X(), position.Y(), position.Z(), momentum.X(), momentum.Y(),
-                                                momentum.Z(), fMC->TrackLength(), time, trackID, GetDetId()));
-  }
-  if (TMath::Abs(lastReferenceR - fMC->TrackLength()) > kMaxDistRef) { /// we can speedup
-    stack->addTrackReference(o2::TrackReference(position.X(), position.Y(), position.Z(), momentum.X(), momentum.Y(),
-                                                momentum.Z(), fMC->TrackLength(), time, trackID, GetDetId()));
-    lastReferenceR = fMC->TrackLength();
-  }
-
   // ===| CONVERT THE ENERGY LOSS TO IONIZATION ELECTRONS |=====================
   //
   // The energy loss is implemented directly below and taken GEANT3,

run/CMakeLists.txt

@@ -334,4 +334,4 @@ install(FILES o2-sim-client.py PERMISSIONS GROUP_READ GROUP_EXECUTE OWNER_EXECUT
 install(DIRECTORY SimExamples/
         DESTINATION examples
         PATTERN *
-        PERMISSIONS GROUP_READ GROUP_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ)
+        PERMISSIONS GROUP_READ GROUP_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ)

run/checkStack.cxx

@@ -144,7 +144,7 @@ int main(int argc, char** argv)
       for (auto& trackID : trackidsinTPC) {
         auto tpc_trackrefs = mcreader.getTrackRefs(eventID, trackID);
         LOG(debug) << " Track " << trackID << " has " << tpc_trackrefs.size() << " TrackRefs";
-        // assert(tpc_trackrefs.size() > 0);
+        assert(tpc_trackrefs.size() > 0);
         for (auto& ref : tpc_trackrefs) {
           assert(ref.getTrackID() == trackID);
         }