Using .replace

Author: Antonio

src/python/WMCore/WMSpec/StdSpecs/Repack.py

@@ -50,10 +50,9 @@ def buildWorkload(self):
 
         # complete output configuration
         for output in self.outputs:
-            # if its a rawSkim dataset, moduleLabel is different
-            if not 'moduleLabel' in output:
-                output['moduleLabel'] = "write_%s_%s" % (output['primaryDataset'],
-                                                         output['dataTier'])
+            moduleLabel = "write_%s_%s" % (output['primaryDataset'],
+                                           output['dataTier'])
+            output['moduleLabel'] = moduleLabel.replace("-", "_")  # For T0 Raw Skims, PDs will contain a "-", so here we replace for "_" for the moduleLabel
 
         # finalize splitting parameters
         mySplitArgs = self.repackSplitArgs.copy()

src/python/WMCore/WMSpec/StdSpecs/StdBase.py

@@ -223,6 +223,8 @@ def determineOutputModules(self, scenarioFunc=None, scenarioArgs=None,
                     outputModules[moduleLabel] = {'dataTier': output['dataTier']}
                     if 'primaryDataset' in output:
                         outputModules[moduleLabel]['primaryDataset'] = output['primaryDataset']
+                    if 'rawSkim' in output:
+                        outputModules[moduleLabel]['rawSkim'] = output['rawSkim']
                     if 'filterName' in output:
                         outputModules[moduleLabel]['filterName'] = output['filterName']
 
@@ -467,6 +469,7 @@ def setupProcessingTask(self, procTask, taskType, inputDataset=None, inputStep=N
                                                                                    self.inputPrimaryDataset),
                                                 configOutput[outputModuleName]['dataTier'],
                                                 configOutput[outputModuleName].get('filterName', None),
+                                                configOutput[outputModuleName].get('rawSkim', None),
                                                 forceMerged=forceMerged, forceUnmerged=forceUnmerged, taskConf=taskConf)
             outputModules[outputModuleName] = outputModule
 
@@ -480,7 +483,7 @@ def setupProcessingTask(self, procTask, taskType, inputDataset=None, inputStep=N
                         del output['primaryDataset']
             if 'primaryDataset' in scenarioArgs:
                 del scenarioArgs['primaryDataset']
-
+            logging.info("+++ scenarioArgs = {}".format(scenarioArgs))
             procTaskCmsswHelper.setDataProcessingConfig(scenarioName, scenarioFunc,
                                                         **scenarioArgs)
         # only in the very end, in order to get it in for the children tasks as well
@@ -507,6 +510,7 @@ def _getDictionaryParams(self, prop, key, default=None):
 
     def addOutputModule(self, parentTask, outputModuleName,
                         primaryDataset, dataTier, filterName,
+                        rawSkim=None,
                         stepName="cmsRun1", forceMerged=False,
                         forceUnmerged=False, taskConf=None):
         """
@@ -583,14 +587,16 @@ def addOutputModule(self, parentTask, outputModuleName,
                                         processedDataset=processedDataset,
                                         dataTier=dataTier,
                                         filterName=filterName,
+                                        rawSkim=rawSkim,
                                         lfnBase=unmergedLFN,
                                         mergedLFNBase=mergedLFN,
                                         transient=isTransient)
 
         return {"primaryDataset": primaryDataset,
                 "dataTier": dataTier,
                 "processedDataset": processedDataset,
-                "filterName": filterName}
+                "filterName": filterName,
+                "rawSkim": rawSkim}
 
     def addLogCollectTask(self, parentTask, taskName="LogCollect", filesPerJob=500,
                           cmsswVersion=None, scramArch=None):