Merge branch 'CMSSW_14_0_X' into from-CMSSW_14_0_X_2024-04-07-2300

Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml

@@ -11,6 +11,9 @@
   <use name="millepede"/>
 </test>
 <test name="testPedeCampaign" command="test_pede.sh"/>
+<test name="testPedeConversion" command="test_pedeConversion.sh">
+  <flags PRE_TEST="testPedeCampaign"/>
+</test>
 <test name="testPayloadSanity" command="test_payload_sanity.sh">
   <flags PRE_TEST="testPedeCampaign"/>
 </test>

Alignment/MillePedeAlignmentAlgorithm/test/align_params_cff.py

@@ -0,0 +1,12 @@
+import FWCore.ParameterSet.Config as cms
+
+_alignParams = cms.PSet(
+    alignParams = cms.vstring(
+        "TrackerP1PXBHalfBarrel,111111",
+        "TrackerP1PXECHalfCylinder,111111",
+        "TrackerTIBHalfBarrel,111111",
+        "TrackerTOBHalfBarrel,rrrrrr",
+        "TrackerTIDEndcap,111111",
+        "TrackerTECEndcap,111111",
+    )
+)

Alignment/MillePedeAlignmentAlgorithm/test/convertMPresToDB_cfg.py

@@ -0,0 +1,111 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Run3_cff import Run3
+process = cms.Process("Alignment", Run3)
+
+process.options = cms.untracked.PSet(
+    Rethrow = cms.untracked.vstring("ProductNotFound") # do not accept this exception
+    )
+
+######################################################
+# initialize  MessageLogger
+######################################################
+process.load("FWCore.MessageService.MessageLogger_cfi")
+process.MessageLogger.files.alignment = cms.untracked.PSet(
+    DEBUG = cms.untracked.PSet(
+        limit = cms.untracked.int32(-1)
+        ),
+    INFO = cms.untracked.PSet(
+        limit = cms.untracked.int32(5),
+        reportEvery = cms.untracked.int32(5)
+        ),
+    WARNING = cms.untracked.PSet(
+        limit = cms.untracked.int32(10)
+        ),
+    ERROR = cms.untracked.PSet(
+        limit = cms.untracked.int32(-1)
+        ),
+    Alignment = cms.untracked.PSet(
+        limit = cms.untracked.int32(-1),
+        reportEvery = cms.untracked.int32(1)
+        ),
+    enableStatistics = cms.untracked.bool(True)
+    )
+
+######################################################
+# Design GT (in order to fetch the design geometry)
+######################################################
+process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2024_design', '')  # take your favourite
+
+######################################################
+# Starting alignment of the campaign
+######################################################
+from CondCore.CondDB.CondDB_cfi import *
+CondDBConnection = CondDB.clone( connect = cms.string( 'sqlite_file:alignment_input.db' ) )
+process.trackerAlignment = cms.ESSource("PoolDBESSource",
+                                        CondDBConnection,
+                                        toGet = cms.VPSet(cms.PSet(record = cms.string("TrackerAlignmentRcd"),
+                                                                   tag = cms.string("TrackerAlignment_PCL_byRun_v2_express_348155")
+                                                                   )
+                                        ))
+
+process.es_prefer_trackerAlignment = cms.ESPrefer("PoolDBESSource", "trackerAlignment")
+
+######################################################
+# Alignment producer
+######################################################
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
+process.load("Alignment.CommonAlignmentProducer.AlignmentProducer_cff")
+
+######################################################
+#
+# !!! This has to match the alignable selection
+#          of the pede configuration !!!
+#
+######################################################
+from align_params_cff import _alignParams
+process.AlignmentProducer.ParameterBuilder.Selector = _alignParams
+
+######################################################
+# Alignment Producer options
+######################################################
+process.AlignmentProducer.doMisalignmentScenario = False #True
+process.AlignmentProducer.applyDbAlignment = True # either globalTag or trackerAlignment
+
+######################################################
+# assign by reference (i.e. could change MillePedeAlignmentAlgorithm as well):
+######################################################
+process.AlignmentProducer.algoConfig = process.MillePedeAlignmentAlgorithm
+process.AlignmentProducer.algoConfig.mode = 'pedeRead'     # reads millepede.res
+process.AlignmentProducer.algoConfig.pedeReader.readFile = 'millepede.res'
+process.AlignmentProducer.algoConfig.treeFile = 'my_treeFile.root'
+
+######################################################
+# Source
+######################################################
+process.source = cms.Source("EmptySource",
+                            firstRun = cms.untracked.uint32(1) # choose your run!
+                            )
+process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1) )
+
+process.dump = cms.EDAnalyzer("EventContentAnalyzer")
+process.p = cms.Path(process.dump)
+
+# should not be needed, but is:
+# otherwise AlignmentProducer does not  call relevant algorithm part
+process.AlignmentProducer.saveToDB = True
+
+######################################################
+# Output alignment payload from reading file
+######################################################
+CondDBConnectionOut = CondDB.clone( connect = cms.string( 'sqlite_file:convertedFromResFile.db' ) )
+process.PoolDBOutputService = cms.Service("PoolDBOutputService",
+                                          CondDBConnectionOut,
+                                          timetype = cms.untracked.string('runnumber'),
+                                          toPut = cms.VPSet(cms.PSet(record = cms.string('TrackerAlignmentRcd'),
+                                                                     tag = cms.string('Alignments')
+                                                                     )
+                                                            )
+                                          )

Alignment/MillePedeAlignmentAlgorithm/test/test_pede.py

@@ -1,4 +1,5 @@
 import FWCore.ParameterSet.Config as cms
+
 process = cms.Process("Alignment")
 
 ################################################################################
@@ -36,7 +37,6 @@
 import Alignment.MillePedeAlignmentAlgorithm.alignmentsetup.GeneralSetup as generalSetup
 generalSetup.setup(process, setupGlobaltag, setupCosmicsZeroTesla)
 
-
 ################################################################################
 # setup alignment producer
 # ------------------------------------------------------------------------------
@@ -50,7 +50,6 @@
     primaryWidth = setupPrimaryWidth,
     cosmicsZeroTesla = setupCosmicsZeroTesla)
 
-
 ################################################################################
 # Overwrite some conditions in global tag
 # ------------------------------------------------------------------------------
@@ -69,16 +68,8 @@
     ]
 #
 # # Define the high-level structure alignables
-process.AlignmentProducer.ParameterBuilder.SelectorRigid = cms.PSet(
-    alignParams = cms.vstring(
-        "TrackerP1PXBHalfBarrel,111111",
-        "TrackerP1PXECHalfCylinder,111111",
-        "TrackerTIBHalfBarrel,111111",
-        "TrackerTOBHalfBarrel,rrrrrr",
-        "TrackerTIDEndcap,111111",
-        "TrackerTECEndcap,111111",
-        )
-    )
+from align_params_cff import _alignParams
+process.AlignmentProducer.ParameterBuilder.SelectorRigid = _alignParams
 
 #########################
 ## insert Pedesettings ##

Alignment/MillePedeAlignmentAlgorithm/test/test_pede.sh

@@ -7,7 +7,7 @@ clean_up(){
     echo -e "\nCleaning the local test area"
     rm -fr milleBinary00* 
     rm -fr pedeSteer* 
-    rm -fr millepede.*
+    #rm -fr millepede.*
     rm -fr *.root
     rm -fr *.log
     rm -fr *.dat

Alignment/MillePedeAlignmentAlgorithm/test/test_pedeConversion.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+function die { echo $1: status $2; exit $2; }
+
+LOCAL_TEST_DIR=${SCRAM_TEST_PATH}
+
+echo "============== testing conversion to DB file from millepede.res"
+(cmsRun ${LOCAL_TEST_DIR}/convertMPresToDB_cfg.py) || die 'failed running convertMPresToDB_cfg.py' $?
+
+echo -e "Content of the current directory is: "`ls .`
+
+INPUTFILE=convertedFromResFile.db
+
+echo -e "\n\n============== testing converted file corresponds to input"
+(cmsRun ${SCRAM_TEST_PATH}/AlignmentRcdChecker_cfg.py inputSqliteFile=${INPUTFILE}) || die 'failed running AlignmentRcdChecker' $?

Configuration/HLT/python/autoCondHLT.py

@@ -18,13 +18,13 @@
     'Fake'         : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc'             , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
     'Fake1'        : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5'                     , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
     'Fake2'        : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml'                         ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
-    'FULL'         : ( ','.join( [ 'L1Menu_Collisions2024_v1_0_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-02-21 12:00:00.000"] ), ),
-    'GRun'         : ( ','.join( [ 'L1Menu_Collisions2024_v1_0_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-02-21 12:00:00.000"] ), ),
-    '2024v10'      : ( ','.join( [ 'L1Menu_Collisions2024_v1_0_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-02-21 12:00:00.000"] ), ),
+    'FULL'         : ( ','.join( [ 'L1Menu_Collisions2024_v1_1_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-20 12:00:00.000"] ), ),
+    'GRun'         : ( ','.join( [ 'L1Menu_Collisions2024_v1_1_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-20 12:00:00.000"] ), ),
+    '2024v11'      : ( ','.join( [ 'L1Menu_Collisions2024_v1_1_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-20 12:00:00.000"] ), ),
     'HIon'         : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2023_v1_1_5_xml'               ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-10-24 16:59:55.000"] ), ),
     'PIon'         : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml'                          ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
     'PRef'         : ( ','.join( [ 'L1Menu_CollisionsPPRef2023_v1_1_2_xml'                   ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-09-21 19:00:00.000"] ), ),
-    'Special'      : ( ','.join( [ 'L1Menu_Collisions2024_v1_0_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-02-21 12:00:00.000"] ), ),
+    'Special'      : ( ','.join( [ 'L1Menu_Collisions2024_v1_1_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-03-20 12:00:00.000"] ), ),
 }
 
 hltGTs = {
@@ -37,7 +37,7 @@
     'run2_mc_Fake2'          : ('run2_mc'                 ,l1Menus['Fake2']),
     'run3_mc_FULL'           : ('phase1_2024_realistic'   ,l1Menus['FULL']),
     'run3_mc_GRun'           : ('phase1_2024_realistic'   ,l1Menus['GRun']),
-    'run3_mc_2024v10'        : ('phase1_2024_realistic'   ,l1Menus['2024v10']),
+    'run3_mc_2024v11'        : ('phase1_2024_realistic'   ,l1Menus['2024v11']),
     'run3_mc_HIon'           : ('phase1_2023_realistic_hi',l1Menus['HIon']),
     'run3_mc_PIon'           : ('phase1_2024_realistic'   ,l1Menus['PIon']),
     'run3_mc_PRef'           : ('phase1_2024_realistic'   ,l1Menus['PRef']),
@@ -49,7 +49,7 @@
     'run2_hlt_Fake2'         : ('run2_hlt_relval'         ,l1Menus['Fake2']),
     'run3_hlt_FULL'          : ('run3_hlt'                ,l1Menus['FULL']),
     'run3_hlt_GRun'          : ('run3_hlt'                ,l1Menus['GRun']),
-    'run3_hlt_2024v10'       : ('run3_hlt'                ,l1Menus['2024v10']),
+    'run3_hlt_2024v11'       : ('run3_hlt'                ,l1Menus['2024v11']),
     'run3_hlt_HIon'          : ('run3_hlt'                ,l1Menus['HIon']),
     'run3_hlt_PIon'          : ('run3_hlt'                ,l1Menus['PIon']),
     'run3_hlt_PRef'          : ('run3_hlt'                ,l1Menus['PRef']),
@@ -61,7 +61,7 @@
     'run2_data_Fake2'        : ('run2_data'               ,l1Menus['Fake2']),
     'run3_data_FULL'         : ('run3_data_prompt'        ,l1Menus['FULL']),
     'run3_data_GRun'         : ('run3_data_prompt'        ,l1Menus['GRun']),
-    'run3_data_2024v10'      : ('run3_data_prompt'        ,l1Menus['2024v10']),
+    'run3_data_2024v11'      : ('run3_data_prompt'        ,l1Menus['2024v11']),
     'run3_data_HIon'         : ('run3_data_prompt'        ,l1Menus['HIon']),
     'run3_data_PIon'         : ('run3_data_prompt'        ,l1Menus['PIon']),
     'run3_data_PRef'         : ('run3_data_prompt'        ,l1Menus['PRef']),

Configuration/PyReleaseValidation/python/relval_nano.py

@@ -175,6 +175,10 @@ def subnext(self):
 steps['EGMNano_mc13.0'] = merge([{'-s':'NANO:@EGM,DQM:@nanoAODDQM', '-n' : '1000'},
                                  steps['NANO_mc13.0']])
 
+steps['BTVNANO_data13.0']=merge([{'-s' : 'NANO:@BTV',
+                                    '-n' : '1000'},
+                                    steps['NANO_data13.0']])
+
 steps['jmeNano_data13.0'] = merge([{'-s':'NANO:@JME', '-n' : '1000'},
                                   steps['NANO_data13.0']])
 
@@ -196,6 +200,10 @@ def subnext(self):
 steps['EGMNano_mc13.2'] = merge([{'-s':'NANO:@EGM,DQM:@nanoAODDQM', '-n' : '1000'},
                                  steps['NANO_mc13.2']])
 
+steps['BTVNANO_mc13.2']=merge([{'-s' : 'NANO:@BTV',
+                                    '-n' : '1000'},
+                                    steps['NANO_mc13.2']])
+
 steps['jmeNANO_mc13.2']=merge([{'-s' : 'NANO:@JME ', '-n' : '1000'},
                                      steps['NANO_mc13.2']])
 
@@ -257,6 +265,7 @@ def subnext(self):
 workflows[_wfn()] = ['EGMNANOdata130Xrun3', ['MuonEG2023MINIAOD13.0', 'EGMNano_data13.0']]
 workflows[_wfn()] = ['jmeNANOdata130Xrun3', ['MuonEG2023MINIAOD13.0', 'jmeNano_data13.0']]
 workflows[_wfn()] = ['lepTimeLifeNANOdata130Xrun3', ['MuonEG2023MINIAOD13.0', 'lepTimeLifeNANO_data13.0']]
+workflows[_wfn()] = ['BTVNANO_data130Xrun3', ['MuonEG2023MINIAOD13.0', 'BTVNANO_data13.0']]
 
 _wfn.next()
 ################
@@ -266,6 +275,7 @@ def subnext(self):
 workflows[_wfn()] = ['EGMNANOmc132X', ['TTBarMINIAOD13.2', 'EGMNano_mc13.2']]
 workflows[_wfn()] = ['jmeNANOmc132X', ['TTBarMINIAOD13.2', 'jmeNANO_mc13.2']]
 workflows[_wfn()] = ['lepTimeLifeNANOmc132X', ['TTBarMINIAOD13.2', 'lepTimeLifeNANO_mc13.2']]
+workflows[_wfn()] = ['BTVNANO_mc132X', ['TTBarMINIAOD13.2', 'BTVNANO_mc13.2']]
 
 _wfn.next()
 ################

DataFormats/MuonReco/src/MuonSelectors.cc

@@ -867,8 +867,7 @@ bool muon::isLooseTriggerMuon(const reco::Muon& muon) {
   bool tk_id = muon::isGoodMuon(muon, TMOneStationTight);
   if (not tk_id)
     return false;
-  bool layer_requirements = muon.innerTrack()->hitPattern().trackerLayersWithMeasurement() > 5 &&
-                            muon.innerTrack()->hitPattern().pixelLayersWithMeasurement() > 0;
+  bool layer_requirements = muon.innerTrack()->hitPattern().trackerLayersWithMeasurement() > 5;
   bool match_requirements =
       (muon.expectedNnumberOfMatchedStations() < 2) or (muon.numberOfMatchedStations() > 1) or (muon.pt() < 8);
   return layer_requirements and match_requirements;

EventFilter/EcalRawToDigi/plugins/alpaka/EcalRawToDigiPortable.cc

@@ -64,6 +64,14 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
         fedsToUnpack_{ps.getParameter<std::vector<int>>("FEDs")} {
     config_.maxChannelsEB = ps.getParameter<uint32_t>("maxChannelsEB");
     config_.maxChannelsEE = ps.getParameter<uint32_t>("maxChannelsEE");
+
+    // Workaround until the ProductID problem in issue https://github.com/cms-sw/cmssw/issues/44643 is fixed
+#ifdef ALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLED
+    producesTemporarily("edm::DeviceProduct<alpaka_cuda_async::EcalDigiDeviceCollection>",
+                        ps.getParameter<std::string>("digisLabelEB"));
+    producesTemporarily("edm::DeviceProduct<alpaka_cuda_async::EcalDigiDeviceCollection>",
+                        ps.getParameter<std::string>("digisLabelEE"));
+#endif
   }
 
   void EcalRawToDigiPortable::produce(device::Event& event, device::EventSetup const& setup) {