Merge pull request #7327 from deguio/T0scripts

add dqmio option to promptReco and harvesting scripts
cms-sw · Jan 23, 2015 · 9cf505a · 9cf505a
2 parents 721e174 + e7585ce
commit 9cf505a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Configuration/DataProcessing/test/RunDQMHarvesting.py b/Configuration/DataProcessing/test/RunDQMHarvesting.py
@@ -22,6 +22,7 @@ def __init__(self):
         self.run = None
         self.globalTag = 'UNSPECIFIED::All'
         self.inputLFN = None
+        self.dqmio = None
 
     def __call__(self):
         if self.scenario == None:
@@ -56,8 +57,12 @@ def __call__(self):
 
 
         try:
+            kwds = {}
+            if not self.dqmio is None:
+                kwds['newDQMIO'] = self.dqmio
+
             process = scenario.dqmHarvesting(self.dataset, self.run,
-                                             self.globalTag)
+                                             self.globalTag, **kwds)
 
         except Exception, ex:
             msg = "Error creating Harvesting config:\n"
@@ -78,7 +83,7 @@ def __call__(self):
 
 if __name__ == '__main__':
     valid = ["scenario=", "run=", "dataset=",
-             "global-tag=", "lfn="]
+             "global-tag=", "lfn=", "dqmio"]
     usage = """RunDQMHarvesting.py <options>"""
     try:
         opts, args = getopt.getopt(sys.argv[1:], "", valid)
@@ -101,5 +106,7 @@ def __call__(self):
             harvester.run = arg
         if opt == "--dataset":
             harvester.dataset = arg
+        if opt == "--dqmio":
+            harvester.dqmio = True
 
     harvester()
diff --git a/Configuration/DataProcessing/test/RunPromptReco.py b/Configuration/DataProcessing/test/RunPromptReco.py
@@ -23,6 +23,7 @@ def __init__(self):
         self.writeAlcareco = False
         self.writeAod = False
 	self.writeDqm = False
+	self.writeDqmio = False
         self.noOutput = False
         self.globalTag = None
         self.inputLFN = None
@@ -62,6 +63,9 @@ def __call__(self):
 	if self.writeDqm:
             dataTiers.append("DQM")
             print "Configuring to Write out Dqm..."
+	if self.writeDqmio:
+            dataTiers.append("DQMIO")
+            print "Configuring to Write out Dqmio..."
 
         try:
             if self.noOutput:
@@ -96,7 +100,7 @@ def __call__(self):
 
 
 if __name__ == '__main__':
-    valid = ["scenario=", "reco", "alcareco", "aod", "dqm",
+    valid = ["scenario=", "reco", "alcareco", "aod", "dqm", "dqmio",
              "no-output", "global-tag=", "lfn="]
     usage = \
 """
@@ -108,6 +112,7 @@ def __call__(self):
  --alcareco (to enable ALCARECO output)
  --aod (to enable AOD output)
  --dqm (to enable DQM output)
+ --dqmio (to enable DQMIO output)
  --no-output (create config with no output, overrides other settings)
  --global-tag=GlobalTag
  --lfn=/store/input/lfn
@@ -138,6 +143,8 @@ def __call__(self):
             recoinator.writeAod = True
         if opt == "--dqm":
             recoinator.writeDqm = True
+        if opt == "--dqmio":
+            recoinator.writeDqmio = True
         if opt == "--no-output":
             recoinator.noOutput = True
         if opt == "--global-tag":