Merge branch 'master' of https://github.com/cms-sw/cmssw into KalmanVertexFit_configurableTrackerBounds

Author: Lovisa

Alignment/CommonAlignmentProducer/python/LSNumberFilter_cfi.py

@@ -6,5 +6,6 @@
     veto_HLT_Menu = [
         "LumiScan",
         "PPS",
-        "ECALTiming"]
+        "ECALTiming",
+        "ECAL"]
     )

CommonTools/RecoUtils/plugins/LeptonFSRProducer.cc

@@ -10,24 +10,21 @@
  */
 
 #include <memory>
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/global/EDProducer.h"
 
+#include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
+#include "DataFormats/PatCandidates/interface/Electron.h"
+#include "DataFormats/PatCandidates/interface/GenericParticle.h"
+#include "DataFormats/PatCandidates/interface/Muon.h"
+#include "DataFormats/PatCandidates/interface/PackedCandidate.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/StreamID.h"
 
-#include "DataFormats/Candidate/interface/Candidate.h"
-#include "DataFormats/PatCandidates/interface/PackedCandidate.h"
-#include "DataFormats/PatCandidates/interface/GenericParticle.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-
-#include "DataFormats/PatCandidates/interface/Muon.h"
-#include "DataFormats/PatCandidates/interface/Electron.h"
-#include "DataFormats/Common/interface/ValueMap.h"
-
 class LeptonFSRProducer : public edm::global::EDProducer<> {
 public:
   explicit LeptonFSRProducer(const edm::ParameterSet& iConfig)
@@ -217,7 +214,7 @@ void LeptonFSRProducer::produce(edm::StreamID streamID, edm::Event& iEvent, cons
     }
   }  // end of loop over pfCands
 
-  edm::OrphanHandle<std::vector<pat::GenericParticle>> oh = iEvent.put(std::move(fsrPhotons));
+  iEvent.put(std::move(fsrPhotons));
 
   {
     std::unique_ptr<edm::ValueMap<int>> bareIdx(new edm::ValueMap<int>());

CommonTools/UtilAlgos/interface/AssociationVectorSelector.h

@@ -68,9 +68,10 @@ void AssociationVectorSelector<KeyRefProd, CVal, KeySelector, ValSelector>::prod
   KeyRefProd ref = evt.getRefBeforePut<collection_t>();
   unique_ptr<association_t> selectedAssociation(new association_t(ref, selected.get()));
   size = selected->size();
-  OrphanHandle<collection_t> oh = evt.put(std::move(selected));
-  for (size_t i = 0; i != size; ++i)
+  evt.put(std::move(selected));
+  for (size_t i = 0; i != size; ++i) {
     selectedAssociation->setValue(i, selectedValues[i]);
+  }
   evt.put(std::move(selectedAssociation));
 }
 

CondFormats/HGCalObjects/interface/HGCalCalibParamSoA.h

@@ -11,23 +11,29 @@
 //#include "CondFormats/HGCalObjects/interface/HGCalMappingModuleIndexer.h"
 
 namespace hgcalrechit {
+  using Vector32f = Eigen::Matrix<float, 32, 1>;
+  using Vector8f = Eigen::Matrix<float, 8, 1>;
+  using Vector3f = Eigen::Matrix<float, 3, 1>;
+  constexpr float TOAtops = 24.41f;
 
   // Generate structure of channel-level arrays (SoA) layout with RecHit dataformat
   GENERATE_SOA_LAYOUT(HGCalCalibParamSoALayout,
-                      SOA_COLUMN(float, ADC_ped),       // ADC pedestals, O(91)
-                      SOA_COLUMN(float, Noise),         // noise, O(3)
-                      SOA_COLUMN(float, CM_slope),      // common mode slope, O(0.25)
-                      SOA_COLUMN(float, CM_ped),        // common mode pedestal (offset), O(92)
-                      SOA_COLUMN(float, BXm1_slope),    // leakage correction from previous bunch, O(0.0)
-                      SOA_COLUMN(float, TOTtoADC),      // TOT linearization in ADC units, O(15)
-                      SOA_COLUMN(float, TOT_ped),       // TOT pedestal (offset), O(9.0)
-                      SOA_COLUMN(float, TOT_lin),       // threshold at which TOT is linear, O(200)
-                      SOA_COLUMN(float, TOT_P0),        // coefficient pol2 in nonlinear region, O(145)
-                      SOA_COLUMN(float, TOT_P1),        // coefficient pol2 in nonlinear region, O(1.0)
-                      SOA_COLUMN(float, TOT_P2),        // coefficient pol2 in nonlinear region, O(0.004)
-                      SOA_COLUMN(float, TOAtops),       // TOA conversion to time (ps)
-                      SOA_COLUMN(float, MIPS_scale),    // MIPS scale
-                      SOA_COLUMN(unsigned char, valid)  // only 1 bit used: if false = mask dead channel
+                      SOA_COLUMN(float, ADC_ped),             // ADC pedestals, O(91)
+                      SOA_COLUMN(float, Noise),               // noise, O(3)
+                      SOA_COLUMN(float, CM_slope),            // common mode slope, O(0.25)
+                      SOA_COLUMN(float, CM_ped),              // common mode pedestal (offset), O(92)
+                      SOA_COLUMN(float, BXm1_slope),          // leakage correction from previous bunch, O(0.0)
+                      SOA_COLUMN(float, TOTtoADC),            // TOT linearization in ADC units, O(15)
+                      SOA_COLUMN(float, TOT_ped),             // TOT pedestal (offset), O(9.0)
+                      SOA_COLUMN(float, TOT_lin),             // threshold at which TOT is linear, O(200)
+                      SOA_COLUMN(float, TOT_P0),              // coefficient pol2 in nonlinear region, O(145)
+                      SOA_COLUMN(float, TOT_P1),              // coefficient pol2 in nonlinear region, O(1.0)
+                      SOA_COLUMN(float, TOT_P2),              // coefficient pol2 in nonlinear region, O(0.004)
+                      SOA_EIGEN_COLUMN(Vector32f, TOA_CTDC),  // TOA coarse TDC correction
+                      SOA_EIGEN_COLUMN(Vector8f, TOA_FTDC),   // TOA fine TDC correction
+                      SOA_EIGEN_COLUMN(Vector3f, TOA_TW),     // TOA timewalk correction
+                      SOA_COLUMN(float, MIPS_scale),          // MIPS scale
+                      SOA_COLUMN(unsigned char, valid)        // only 1 bit used: if false = mask dead channel
   )
   using HGCalCalibParamSoA = HGCalCalibParamSoALayout<>;
 

CondFormats/Serialization/interface/eos/portable_iarchive.hpp

@@ -409,7 +409,7 @@ namespace eos {
       // created through BOOST_STRONG_TYPEDEF(X, some unsigned int) like
       // library_version_type, collection_size_type, item_version_type,
       // class_id_type, object_id_type, version_type and tracking_type
-      load((typename boost::uint_t<sizeof(T) * CHAR_BIT>::least&)(t));
+      load(static_cast<T::base_type&>(t));
     }
   };
 

Configuration/AlCa/python/autoCond.py

@@ -88,7 +88,7 @@
     # GlobalTag for MC production (cosmics) with perfectly aligned and calibrated detector for Phase1 2023, Strip tracker in DECO mode
     'phase1_2023_cosmics_design'   :    '140X_mcRun3_2023cosmics_design_deco_v1',
     # GlobalTag for MC production with realistic conditions for Phase1 2023 detector for Heavy Ion
-    'phase1_2023_realistic_hi'     :    '141X_mcRun3_2023_realistic_HI_v5',
+    'phase1_2023_realistic_hi'     :    '141X_mcRun3_2023_realistic_HI_v11',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2024
     'phase1_2024_design'           :    '140X_mcRun3_2024_design_v11',
     # GlobalTag for MC production with realistic conditions for Phase1 2024
@@ -98,7 +98,7 @@
     # GlobalTag for MC production (cosmics) with perfectly aligned and calibrated detector for Phase1 2024, Strip tracker in DECO mode
     'phase1_2024_cosmics_design'   :    '140X_mcRun3_2024cosmics_design_deco_v11',
     # GlobalTag for MC production with realistic conditions for Phase1 2024 detector for Heavy Ion
-    'phase1_2024_realistic_hi'     :    '141X_mcRun3_2024_realistic_HI_v13',
+    'phase1_2024_realistic_hi'     :    '141X_mcRun3_2024_realistic_HI_v14',
     # GlobalTag for MC production with realistic conditions for Phase1 2024 detector for ppRef5TeV
     'phase1_2024_realistic_ppRef5TeV' : '141X_mcRun3_2024_realistic_ppRef5TeV_v7',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2025

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))

Configuration/EventContent/python/EventContent_cff.py

@@ -690,6 +690,10 @@ def SwapKeepAndDrop(l):
                             'keep *_hltGeneralTracks_*_*',
                             'keep *_hltInitialStepTrackSelectionHighPurity_*_*',
                             'keep *_hltHighPtTripletStepTrackSelectionHighPurity_*_*',
+                            'keep *_hltInitialStepTrackSelectionHighPuritypTTCLST_*_*',
+                            'keep *_hltInitialStepTrackSelectionHighPuritypLSTCLST_*_*',
+                            'keep *_hltInitialStepTracksT5TCLST_*_*',
+                            'keep *_hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST_*_*',
                             'keep *_hltOfflinePrimaryVertices_*_*',
                             'keep *_hltHGCalRecHit_*_*'
                         ])

Configuration/HLT/python/autoCondHLT.py

@@ -38,7 +38,7 @@
     'run3_mc_FULL'           : ('phase1_2024_realistic'   ,l1Menus['FULL']),
     'run3_mc_GRun'           : ('phase1_2024_realistic'   ,l1Menus['GRun']),
     'run3_mc_2024v14'        : ('phase1_2024_realistic'   ,l1Menus['2024v14']),
-    'run3_mc_HIon'           : ('phase1_2023_realistic_hi',l1Menus['HIon']),
+    'run3_mc_HIon'           : ('phase1_2024_realistic_hi',l1Menus['HIon']),
     'run3_mc_PIon'           : ('phase1_2024_realistic'   ,l1Menus['PIon']),
     'run3_mc_PRef'           : ('phase1_2024_realistic'   ,l1Menus['PRef']),
     'run3_mc_Special'        : ('phase1_2024_realistic'   ,l1Menus['Special']),

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -4759,6 +4759,14 @@ def gen2024HiMix(fragment,howMuch):
                                       '--geometry' : geom
                                       }
 
+    upgradeStepDict['RecoGlobalFakeHLT'][k] = {'-s':'RAW2DIGI,RECO,RECOSIM,PAT,VALIDATION:@phase2ValidationFakeHLT+@miniAODValidation,DQM:@phase2FakeHLT+@miniAODDQM',
+                                               '--conditions':gt,
+                                               '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
+                                               '-n':'10',
+                                               '--eventcontent':'FEVTDEBUGHLT,MINIAODSIM,DQM',
+                                               '--geometry' : geom
+                                               }
+
     upgradeStepDict['RecoLocal'][k] = {'-s':'RAW2DIGI,L1Reco,RECO:localreco',
                                       '--conditions':gt,
                                       '--datatier':'GEN-SIM-RECO',
@@ -4809,6 +4817,8 @@ def gen2024HiMix(fragment,howMuch):
 
     upgradeStepDict['HARVESTGlobal'][k] = merge([{'-s': 'HARVESTING:@phase2Validation+@phase2+@miniAODValidation+@miniAODDQM'}, upgradeStepDict['HARVEST'][k]])
 
+    upgradeStepDict['HARVESTGlobalFakeHLT'][k] = merge([{'-s': 'HARVESTING:@phase2ValidationFakeHLT+@phase2FakeHLT+@miniAODValidation+@miniAODDQM'}, upgradeStepDict['HARVEST'][k]])
+
     upgradeStepDict['ALCA'][k] = {'-s':'ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+TkAlMuonIsolated+TkAlMinBias+MuAlOverlaps+EcalESAlign+TkAlZMuMu+TkAlDiMuonAndVertex+HcalCalHBHEMuonProducerFilter+TkAlUpsilonMuMu+TkAlJpsiMuMu+SiStripCalMinBias',
                                       '--conditions':gt,
                                       '--datatier':'ALCARECO',