Merge production into production_singlePion_0-20GeV

ECCE-EIC · Nov 11, 2021 · b399f7a · b399f7a
2 parents ef2da02 + 40d17f7
commit b399f7a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/common/G4_Tracking_EIC.C b/common/G4_Tracking_EIC.C
@@ -30,6 +30,7 @@ namespace G4TRACKING
   bool PROJECTION_EHCAL = false;
   bool PROJECTION_CEMC = false;
   bool PROJECTION_BECAL = false;
+  bool PROJECTION_HCALIN = false;
   bool PROJECTION_HCALOUT = false;
   bool PROJECTION_FEMC = false;
   bool PROJECTION_FHCAL = false;
@@ -131,6 +132,14 @@ void Tracking_Reco()
     TRACKING::ProjectionNames.insert("BECAL");
   }
   //-------------------------
+  // HCALIN
+  //-------------------------
+  if (Enable::HCALIN && G4TRACKING::PROJECTION_HCALIN)
+  {
+    TRACKING::FastKalmanFilter->add_state_name("HCALIN");
+    TRACKING::ProjectionNames.insert("HCALIN");
+  }
+  //-------------------------
   // HCALOUT
   //-------------------------
   if (Enable::HCALOUT && G4TRACKING::PROJECTION_HCALOUT)

diff --git a/detectors/EICDetector/Fun4All_G4_EICDetector.C b/detectors/EICDetector/Fun4All_G4_EICDetector.C
@@ -304,6 +304,7 @@ int Fun4All_G4_EICDetector(
   G4TRACKING::PROJECTION_BECAL = true;
   G4TRACKING::PROJECTION_EHCAL = true;
   G4TRACKING::PROJECTION_CEMC = true;
+  G4TRACKING::PROJECTION_HCALIN = true;
   G4TRACKING::PROJECTION_HCALOUT = true;
   G4TRACKING::PROJECTION_FEMC = true;
   G4TRACKING::PROJECTION_FHCAL = true;
@@ -594,7 +595,7 @@ int Fun4All_G4_EICDetector(
 
   if (Enable::B0ECAL_EVAL) B0ECAL_Eval(outputroot + "_g4b0ecal_eval_test.root"); // For B0Ecal
 
-  if (Enable::FWDJETS_EVAL) Jet_FwdEval();
+  //if (Enable::FWDJETS_EVAL) Jet_FwdEval();
 
   if (Enable::USER) UserAnalysisInit();