Merge pull request #12326 from slava77/CMSSW_7_5_X_2015-11-05-2300/si…

…gn626/hiRepackSettings

pass isRepacked flag to config builder if set in a scenario

Configuration/DataProcessing/python/Impl/HeavyIonsRun2.py

@@ -33,6 +33,11 @@ def _checkMINIAOD(self,**args):
                 if a['dataTier'] == 'MINIAOD':
                     raise RuntimeError("MINIAOD is not supported in HeavyIonsRun2")
 
+
+    def _setRepackedFlag(self,args):
+        if not 'repacked' in args:
+            args['repacked']= True
+
     def promptReco(self, globalTag, **args):
         """
         _promptReco_
@@ -41,6 +46,7 @@ def promptReco(self, globalTag, **args):
 
         """
         self._checkMINIAOD(**args)
+        self._setRepackedFlag(args)
 
         if not 'skims' in args:
             args['skims']=['@allForPrompt']
@@ -64,6 +70,7 @@ def expressProcessing(self, globalTag, **args):
 
         """
         self._checkMINIAOD(**args)
+        self._setRepackedFlag(args)
 
         if not 'skims' in args:
             args['skims']=['@allForExpress']

Configuration/DataProcessing/python/Reco.py

@@ -26,6 +26,16 @@ def __init__(self):
 
     """
 
+
+    def _checkRepackedFlag(self, options, **args):
+        if 'repacked' in args:
+            if args['repacked'] == True:
+                options.isRepacked = True
+            else:
+                options.isRepacked = False
+
+
+
     def promptReco(self, globalTag, **args):
         """
         _promptReco_
@@ -55,6 +65,7 @@ def promptReco(self, globalTag, **args):
         """
         options.runUnscheduled=True
 
+        self._checkRepackedFlag(options, **args)
 
         if 'customs' in args:
             options.customisation_file=args['customs']
@@ -116,6 +127,8 @@ def expressProcessing(self, globalTag, **args):
         if 'customs' in args:
             options.customisation_file=args['customs']
 
+        self._checkRepackedFlag(options,**args)
+
         cb = ConfigBuilder(options, process = process, with_output = True, with_input = True)
 
         cb.prepare()

Configuration/DataProcessing/test/RunPromptReco.py

@@ -29,6 +29,8 @@ def __init__(self):
         self.alcaRecos = None
         self.PhysicsSkims = None
         self.dqmSeq = None
+        self.setRepacked = False
+        self.isRepacked = False
 
     def __call__(self):
         if self.scenario == None:
@@ -93,6 +95,9 @@ def __call__(self):
                 if self.dqmSeq:
                     kwds['dqmSeq'] = self.dqmSeq
 
+                if self.setRepacked:
+                    kwds['repacked'] = self.isRepacked
+
             process = scenario.promptReco(self.globalTag, **kwds)
 
         except NotImplementedError, ex:
@@ -119,7 +124,7 @@ def __call__(self):
 
 if __name__ == '__main__':
     valid = ["scenario=", "reco", "aod", "miniaod","dqm", "dqmio", "no-output",
-             "global-tag=", "lfn=", "alcarecos=", "PhysicsSkims=", "dqmSeq=" ]
+             "global-tag=", "lfn=", "alcarecos=", "PhysicsSkims=", "dqmSeq=", "isRepacked", "isNotRepacked" ]
     usage = \
 """
 RunPromptReco.py <options>
@@ -131,6 +136,7 @@ def __call__(self):
  --miniaod (to enable MiniAOD output)
  --dqm (to enable DQM output)
  --dqmio (to enable DQMIO output)
+ --isRepacked --isNotRepacked (to override default repacked flags)
  --no-output (create config with no output, overrides other settings)
  --global-tag=GlobalTag
  --lfn=/store/input/lfn
@@ -182,5 +188,12 @@ def __call__(self):
             recoinator.PhysicsSkims = [ x for x in arg.split('+') if len(x) > 0 ]
         if opt == "--dqmSeq":
             recoinator.dqmSeq = [ x for x in arg.split('+') if len(x) > 0 ]
+        if opt == "--isRepacked":
+            recoinator.setRepacked = True
+            recoinator.isRepacked = True
+        if opt == "--isNotRepacked":
+            recoinator.setRepacked = True
+            recoinator.isRepacked = False
+
 
     recoinator()