CPAlgorithms: smarter systematic printouts

CPAlgorithms: smarter systematic printouts

PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/AsgAnalysisConfig.py

@@ -182,7 +182,7 @@ class GeneratorAnalysisBlock (ConfigBlock):
         super (GeneratorAnalysisBlock, self).__init__ ('Generator')
         self.addOption ('saveCutBookkeepers', True, type=bool)
         self.addOption ('runNumber', None, type=int)
-        self.addOption ('cutBookkeepersSystematics', True, type=bool)
+        self.addOption ('cutBookkeepersSystematics', None, type=bool)
 
     def makeAlgs (self, config) :
 
@@ -200,7 +200,10 @@ class GeneratorAnalysisBlock (ConfigBlock):
         if self.saveCutBookkeepers:
           alg = config.createAlgorithm('CP::AsgCutBookkeeperAlg', 'CutBookkeeperAlg')
           alg.runNumber = self.runNumber
-          alg.enableSystematics = self.cutBookkeepersSystematics
+          if self.cutBookkeepersSystematics:
+              alg.enableSystematics = self.cutBookkeepersSystematics
+          else:
+              alg.enableSystematics = not config.noSystematics()
           config.addPrivateTool( 'truthWeightTool', 'PMGTools::PMGTruthWeightTool' )
 
         # Set up the weights algorithm:

PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SystematicsSvc.cxx

@@ -270,21 +270,26 @@ namespace CP
   StatusCode SystematicsSvc ::
   finalize ()
   {
-    for (const CP::SystematicVariation& mysys : m_affectingSystematics)
-    {
-      // this logic checks whether a systematic is recommended and
-      // affecting, or only affecting.  if it is only the later, it
-      // reports the systematic in parenthesis to set it apart.
-      if (m_recommendedSystematics.find (mysys) == m_recommendedSystematics.end())
-        ANA_MSG_INFO ("found systematic: (" << mysys << ")");
-      else
-        ANA_MSG_INFO ("found systematic: " << mysys);
+    if (m_systematicsList.empty()) {
+      ANA_MSG_INFO ("no systematics were run.");
     }
-
-    if(m_systematicsRegex!=".*") {
-      ANA_MSG_INFO("Systematics regex '" << m_systematicsRegex << "' matched:");
-      for(const CP::SystematicSet& mysys : makeSystematicsVector()) {
+    else{
+      for (const CP::SystematicVariation& mysys : m_affectingSystematics)
+	{
+	  // this logic checks whether a systematic is recommended and
+	  // affecting, or only affecting.  if it is only the later, it
+	  // reports the systematic in parenthesis to set it apart.
+	  if (m_recommendedSystematics.find (mysys) == m_recommendedSystematics.end())
+	    ANA_MSG_INFO ("found systematic: (" << mysys << ")");
+	  else
+	    ANA_MSG_INFO ("found systematic: " << mysys);
+	}
+
+      if(m_systematicsRegex!=".*") {
+	ANA_MSG_INFO("Systematics regex '" << m_systematicsRegex << "' matched:");
+	for(const CP::SystematicSet& mysys : makeSystematicsVector()) {
           ANA_MSG_INFO ("  '" << mysys.name() << "'");
+	}
       }
     }
     return StatusCode::SUCCESS;