Merge production into production_singlePion_0-20GeV

ECCE-EIC · Sep 30, 2021 · b9129ff · b9129ff
2 parents 2bfe6d0 + 97b6760
commit b9129ff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/common/G4_EventEvaluator.C b/common/G4_EventEvaluator.C
@@ -37,21 +37,22 @@ void Event_Eval(const std::string &filename)
     if (Enable::DIRC_RECO or Enable::mRICH_RECO or Enable::RICH_RECO)
       eval->set_do_PID_LogLikelihood(true);
   }
-  if (Enable::CEMC_CLUSTER) eval->set_do_CEMC(true);
-  if (Enable::EEMC_CLUSTER) eval->set_do_EEMC(true);
-  if (Enable::FEMC_CLUSTER) eval->set_do_FEMC(true);
-  if (Enable::HCALIN_CLUSTER) eval->set_do_HCALIN(true);
-  if (Enable::HCALOUT_CLUSTER) eval->set_do_HCALOUT(true);
-  if (Enable::FHCAL_CLUSTER) eval->set_do_FHCAL(true);
+  if (Enable::CEMC) eval->set_do_CEMC(true);
+  if (Enable::EEMC || Enable::EEMCH) eval->set_do_EEMC(true);
+  if (Enable::EEMCH && G4EEMCH::SETTING::USEHYBRID) eval->set_do_EEMCG(true);
+  if (Enable::FEMC) eval->set_do_FEMC(true);
+  if (Enable::EHCAL) eval->set_do_EHCAL(true);
+  if (Enable::HCALIN) eval->set_do_HCALIN(true);
+  if (Enable::HCALOUT) eval->set_do_HCALOUT(true);
+  if (Enable::FHCAL) eval->set_do_FHCAL(true);
   if (Enable::FHCAL_CLUSTER || Enable::FEMC_CLUSTER || Enable::EEMC_CLUSTER) eval->set_do_CLUSTERS(true);
-  if (Enable::DRCALO_CLUSTER) eval->set_do_DRCALO(true);
-  if (Enable::LFHCAL_CLUSTER) eval->set_do_LFHCAL(true);
+  if (Enable::DRCALO) eval->set_do_DRCALO(true);
+  if (Enable::LFHCAL) eval->set_do_LFHCAL(true);
   if (Enable::BECAL) eval->set_do_BECAL(true);
 
   eval->set_do_MCPARTICLES(true);
-  eval->set_do_HEPMC(Input::PYTHIA6 or Input::PYTHIA8 or Input::SARTRE or Input::HEPMC
-      or Input::READEIC  );
-  eval->set_do_store_event_level_info( Input::PYTHIA6 or Input::PYTHIA8 or Input::READEIC  );
+  eval->set_do_HEPMC(Input::PYTHIA6 or Input::PYTHIA8 or Input::SARTRE or Input::HEPMC or Input::READEIC);
+  eval->set_do_store_event_level_info(Input::PYTHIA6 or Input::PYTHIA8 or Input::READEIC);
   se->registerSubsystem(eval);
 
   return;

diff --git a/detectors/EICDetector/Fun4All_runEvaluators.C b/detectors/EICDetector/Fun4All_runEvaluators.C
@@ -75,7 +75,7 @@ int Fun4All_runEvaluators(
   Enable::LFHCAL_EVAL = true;
   Enable::EEMCH_EVAL = true;
   Enable::EHCAL_EVAL = true;
-  Enable::FWDJETS_EVAL = true;
+  Enable::FWDJETS_EVAL = false;
   Enable::FFR_EVAL = true;
 
   map<string, string> evaluatorNames;
@@ -95,13 +95,13 @@ int Fun4All_runEvaluators(
    * WARNING!!! Ensure your DST has the right nodes
    */
   Enable::TRACKING = true;
-  Enable::BECAL_CLUSTER = true;
-  Enable::HCALIN_CLUSTER = true;
-  Enable::HCALOUT_CLUSTER = true;
-  Enable::FEMC_CLUSTER = true;
-  Enable::LFHCAL_CLUSTER = true;
-  Enable::EEMCH_CLUSTER = true;
-  Enable::EHCAL_CLUSTER = true;
+  Enable::BECAL = true;
+  Enable::HCALIN = true;
+  Enable::HCALOUT = true;
+  Enable::FEMC = true;
+  Enable::LFHCAL = true;
+  Enable::EEMCH = true;
+  Enable::EHCAL = true;
 
   TRACKING::ProjectionNames = {"BECAL"
                               ,"CTTL_0"