Merge branch 'master' into cosmicsStripClusterCut

Author: jlidrych

Diff for: Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHLT_cff.py

@@ -13,10 +13,8 @@
 
 # Ingredient: onlineBeamSpot
 import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
-onlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()
-
-import RecoVertex.BeamSpotProducer.onlineBeamSpotESProducer_cfi as _mod
-BeamSpotESProducer = _mod.onlineBeamSpotESProducer.clone(
+onlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone(
+    useBSOnlineRecords = True,
     timeThreshold = 999999 # for express allow >48h old payloads for replays. DO NOT CHANGE
 )
 

Diff for: CalibTracker/SiStripESProducers/plugins/real/SiStripBackPlaneCorrectionDepESProducer.cc

@@ -119,7 +119,7 @@ void SiStripBackPlaneCorrectionDepESProducer::fillDescriptions(edm::Configuratio
     desc.add<edm::ParameterSetDescription>("BackPlaneCorrectionDeconvMode", deconv);
   }
 
-  descriptions.addDefault(desc);
+  descriptions.addWithDefaultLabel(desc);
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(SiStripBackPlaneCorrectionDepESProducer);

Diff for: CalibTracker/SiStripESProducers/plugins/real/SiStripLorentzAngleDepESProducer.cc

@@ -116,7 +116,7 @@ void SiStripLorentzAngleDepESProducer::fillDescriptions(edm::ConfigurationDescri
     desc.add<edm::ParameterSetDescription>("LorentzAngleDeconvMode", deconv);
   }
 
-  descriptions.addDefault(desc);
+  descriptions.addWithDefaultLabel(desc);
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(SiStripLorentzAngleDepESProducer);

Diff for: CalibTracker/SiStripESProducers/python/SiStripBackPlaneCorrectionDepESProducer_cfi.py

@@ -1,18 +1,5 @@
 # -*- coding: utf-8 -*-
 import FWCore.ParameterSet.Config as cms
 
-siStripBackPlaneCorrectionDepESProducer = cms.ESProducer("SiStripBackPlaneCorrectionDepESProducer",
-   
-     LatencyRecord =   cms.PSet(
-            record = cms.string('SiStripLatencyRcd'),
-            label = cms.untracked.string('')
-            ),
-	BackPlaneCorrectionPeakMode = cms.PSet(
-            record = cms.string('SiStripBackPlaneCorrectionRcd'),
-            label = cms.untracked.string('peak')
-            ),
-        BackPlaneCorrectionDeconvMode = cms.PSet(
-            record = cms.string('SiStripBackPlaneCorrectionRcd'),
-            label = cms.untracked.string('deconvolution')
-            )
-   )
+from CalibTracker.SiStripESProducers.siStripBackPlaneCorrectionDepESProducer_cfi import siStripBackPlaneCorrectionDepESProducer as _siStripBackPlaneCorrectionDepESProducer
+siStripBackPlaneCorrectionDepESProducer = _siStripBackPlaneCorrectionDepESProducer.clone()

Diff for: CalibTracker/SiStripESProducers/python/SiStripLorentzAngleDepESProducer_cfi.py

@@ -1,21 +1,5 @@
 # -*- coding: utf-8 -*-
 import FWCore.ParameterSet.Config as cms
 
-siStripLorentzAngleDepESProducer = cms.ESProducer("SiStripLorentzAngleDepESProducer",
-   
-     LatencyRecord =   cms.PSet(
-            record = cms.string('SiStripLatencyRcd'),
-            label = cms.untracked.string('')
-            ),
-	LorentzAnglePeakMode = cms.PSet(
-            record = cms.string('SiStripLorentzAngleRcd'),
-            label = cms.untracked.string('peak')
-            ),
-        LorentzAngleDeconvMode = cms.PSet(
-            record = cms.string('SiStripLorentzAngleRcd'),
-            label = cms.untracked.string('deconvolution')
-            )
-        
-   )
-
-
+from CalibTracker.SiStripESProducers.siStripLorentzAngleDepESProducer_cfi import siStripLorentzAngleDepESProducer as _siStripLorentzAngleDepESProducer
+siStripLorentzAngleDepESProducer = _siStripLorentzAngleDepESProducer.clone()

Diff for: Configuration/AlCa/python/autoCond.py

@@ -105,6 +105,8 @@
     'phase1_2025_design'           :    '142X_mcRun3_2025_design_v1',
     # GlobalTag for MC production with realistic conditions for Phase1 2025
     'phase1_2025_realistic'        :    '142X_mcRun3_2025_realistic_v7',
+    # GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2024, Strip tracker in DECO mode
+    'phase1_2025_cosmics'          :    '142X_mcRun3_2025cosmics_realistic_deco_v1',
     # GlobalTag for MC production with realistic conditions for Phase2
     'phase2_realistic'             :    '141X_mcRun4_realistic_v3'
 }

Diff for: Configuration/Applications/python/ConfigBuilder.py

@@ -139,7 +139,7 @@ def filesFromList(fileName,s=None):
         print("found parent files:",sec)
     return (prim,sec)
 
-def filesFromDASQuery(query,option="",s=None):
+def filesFromDASQuery(query,option="",s=None,max_files=None):
     import os,time
     import FWCore.ParameterSet.Config as cms
     prim=[]
@@ -172,6 +172,10 @@ def filesFromDASQuery(query,option="",s=None):
     # remove any duplicates
     prim = sorted(list(set(prim)))
     sec = sorted(list(set(sec)))
+    if max_files:
+        max_files=int(max_files)
+        prim = prim[:max_files]
+        sec = sec[:max_files]
     if s:
         if not hasattr(s,"fileNames"):
             s.fileNames=cms.untracked.vstring(prim)
@@ -412,12 +416,19 @@ def addSource(self):
         self.addedObjects.append(("Input source","source"))
 
         def filesFromOption(self):
+            def _datasetname_and_maxfiles(entry):
+                if ":" in entry:
+                    return entry.split(":")
+                else:
+                    return entry,None
+
             for entry in self._options.filein.split(','):
                 print("entry",entry)
                 if entry.startswith("filelist:"):
-                    filesFromList(entry[9:],self.process.source)
+                    filesFromList(entry.split(":",1)[1],self.process.source)
                 elif entry.startswith("dbs:") or entry.startswith("das:"):
-                    filesFromDASQuery('file dataset = %s'%(entry[4:]),self._options.dasoption,self.process.source)
+                    dataset_name,max_files = _datasetname_and_maxfiles(entry.split(":",1)[1])
+                    filesFromDASQuery('file dataset = %s'%(dataset_name),self._options.dasoption,self.process.source,max_files)
                 else:
                     self.process.source.fileNames.append(self._options.dirin+entry)
             if self._options.secondfilein:
@@ -426,9 +437,10 @@ def filesFromOption(self):
                 for entry in self._options.secondfilein.split(','):
                     print("entry",entry)
                     if entry.startswith("filelist:"):
-                        self.process.source.secondaryFileNames.extend((filesFromList(entry[9:]))[0])
+                        self.process.source.secondaryFileNames.extend((filesFromList(entry.split(":",1)[1]))[0])
                     elif entry.startswith("dbs:") or entry.startswith("das:"):
-                        self.process.source.secondaryFileNames.extend((filesFromDASQuery('file dataset = %s'%(entry[4:]),self._options.dasoption))[0])
+                        dataset_name,max_files = _datasetname_and_maxfiles(entry.split(":",1)[1])
+                        self.process.source.secondaryFileNames.extend((filesFromDASQuery('file dataset = %s'%(dataset_name),self._options.dasoption))[0])
                     else:
                         self.process.source.secondaryFileNames.append(self._options.dirin+entry)
 
@@ -680,12 +692,15 @@ def doNotInlineEventContent(instance,label = "cms.untracked.vstring(process."+th
             if streamType=='': continue
             if streamType == 'ALCARECO' and not 'ALCAPRODUCER' in self._options.step: continue
             if streamType=='DQMIO': streamType='DQM'
+            streamQualifier=''
+            if streamType[-1].isdigit():
+                ## a special case where --eventcontent MINIAODSIM1 is set to have more than one output in a chain of configuration
+                streamQualifier = str(streamType[-1])
+                streamType = streamType[:-1]
             eventContent=streamType
             ## override streamType to eventContent in case NANOEDM
-            if streamType == "NANOEDMAOD" :
-                eventContent = "NANOAOD"
-            elif streamType == "NANOEDMAODSIM" :
-                eventContent = "NANOAODSIM"
+            if streamType.startswith("NANOEDMAOD"):
+                eventContent = eventContent.replace("NANOEDM","NANO")
             theEventContent = getattr(self.process, eventContent+"EventContent")
             if i==0:
                 theFileName=self._options.outfile_name
@@ -714,10 +729,11 @@ def doNotInlineEventContent(instance,label = "cms.untracked.vstring(process."+th
                 output.dataset.filterName = cms.untracked.string('StreamALCACombined')
 
             if "MINIAOD" in streamType:
+                ## we should definitely get rid of this customization by now
                 from PhysicsTools.PatAlgos.slimming.miniAOD_tools import miniAOD_customizeOutput
                 miniAOD_customizeOutput(output)
 
-            outputModuleName=streamType+'output'
+            outputModuleName=streamType+streamQualifier+'output'
             setattr(self.process,outputModuleName,output)
             outputModule=getattr(self.process,outputModuleName)
             setattr(self.process,outputModuleName+'_step',cms.EndPath(outputModule))

Diff for: Configuration/DataProcessing/python/Impl/hltScoutingEra_Run3_2025.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+"""
+_hltScoutingEra_Run3_2025_
+
+Scenario supporting proton collisions with input HLT scouting data for 2025
+
+"""
+
+import os
+import sys
+
+from Configuration.Eras.Era_Run3_2025_cff import Run3_2025
+from Configuration.DataProcessing.Impl.hltScouting import hltScouting
+
+class hltScoutingEra_Run3_2025(hltScouting):
+    def __init__(self):
+        hltScouting.__init__(self)
+        self.recoSeq = ''
+        self.cbSc = 'pp'
+        self.eras = Run3_2025
+        self.promptCustoms += ['Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025']
+    """
+    _hltScoutingEra_Run3_2025_
+    Implement configuration building for data processing for proton
+    collision data taking with input HLT scouting data for Era_Run3_2025
+    """

Diff for: Configuration/DataProcessing/python/Impl/ppEra_Run3_2025.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+"""
+_ppEra_Run3_2025_
+Scenario supporting proton collisions for 2025
+"""
+
+import os
+import sys
+
+from Configuration.DataProcessing.Reco import Reco
+import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Run3_2025_cff import Run3_2025
+
+from Configuration.DataProcessing.Impl.pp import pp
+
+class ppEra_Run3_2025(pp):
+    def __init__(self):
+        pp.__init__(self)
+        self.recoSeq=''
+        self.cbSc='pp'
+        self.eras=Run3_2025
+        self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025' ]
+        self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025' ]
+        self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025' ]
+    """
+    _ppEra_Run3_2025_
+    Implement configuration building for data processing for proton
+    collision data taking for Run3_2025
+    """

Diff for: Configuration/DataProcessing/python/Impl/ppEra_Run3_2025_OXY.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+"""
+_ppEra_Run3_2025_OXY_
+Scenario supporting OXY collisions for 2025
+"""
+
+import os
+import sys
+
+from Configuration.DataProcessing.Reco import Reco
+import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Run3_2025_OXY_cff import Run3_2025_OXY
+
+from Configuration.DataProcessing.Impl.pp import pp
+
+class ppEra_Run3_2025_OXY(pp):
+    def __init__(self):
+        pp.__init__(self)
+        self.recoSeq=''
+        self.cbSc='pp'
+        self.isRepacked=True
+        self.eras=Run3_2025_OXY
+        self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_OXY' ]
+        self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_OXY' ]
+        self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_OXY' ]
+    """
+    _ppEra_Run3_2025_OXY_
+    Implement configuration building for data processing for proton
+    collision data taking for Run3_2025
+    """

Diff for: Configuration/DataProcessing/python/Impl/ppEra_Run3_2025_UPC.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+"""
+_ppEra_Run3_2025_UPC_
+Scenario supporting UPC collisions for 2025
+"""
+
+import os
+import sys
+
+from Configuration.DataProcessing.Reco import Reco
+import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Run3_2025_UPC_cff import Run3_2025_UPC
+
+from Configuration.DataProcessing.Impl.pp import pp
+
+class ppEra_Run3_2025_UPC(pp):
+    def __init__(self):
+        pp.__init__(self)
+        self.recoSeq=''
+        self.cbSc='pp'
+        self.isRepacked=True
+        self.eras=Run3_2025_UPC
+        self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_UPC' ]
+        self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_UPC' ]
+        self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_2025_UPC' ]
+    """
+    _ppEra_Run3_2025_UPC_
+    Implement configuration building for data processing for proton
+    collision data taking for Run3_2025
+    """

Diff for: Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_2025.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+"""
+_ppEra_Run3_pp_on_PbPb_2025_
+
+Scenario supporting heavy ions collisions
+
+"""
+
+import os
+import sys
+
+from Configuration.DataProcessing.Reco import Reco
+import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Run3_pp_on_PbPb_2025_cff import Run3_pp_on_PbPb_2025
+
+from Configuration.DataProcessing.Impl.pp import pp
+
+class ppEra_Run3_pp_on_PbPb_2025(pp):
+    def __init__(self):
+        pp.__init__(self)
+        self.recoSeq=''
+        self.cbSc='pp'
+        self.isRepacked=True
+        self.eras=Run3_pp_on_PbPb_2025
+        self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2025' ]
+        self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2025' ]
+        self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_2025' ]
+    """
+    _ppEra_Run3_pp_on_PbPb_2025_
+
+    Implement configuration building for data processing for pp-like processing of HI
+    collision data taking for Run3
+
+    """

Diff for: Configuration/DataProcessing/python/Impl/ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2025.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+"""
+_ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2025_
+
+Scenario supporting heavy ions collisions
+
+"""
+
+import os
+import sys
+
+from Configuration.DataProcessing.Reco import Reco
+from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_2025_cff import Run3_pp_on_PbPb_approxSiStripClusters_2025
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.DataProcessing.Impl.pp import pp
+
+class ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2025(pp):
+    def __init__(self):
+        pp.__init__(self)
+        self.recoSeq=''
+        self.cbSc='pp'
+        self.isRepacked=True
+        self.eras=Run3_pp_on_PbPb_approxSiStripClusters_2025
+        self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2025' ]
+        self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2025' ]
+        self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_pp_on_PbPb_approxSiStripClusters_2025' ]
+
+    """
+    _ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2025_
+
+    Implement configuration building for data processing for pp-like processing of HI
+    collision data taking for Run3 with approxSiStripClusters (rawprime format)
+
+    """