Vertex smearing for PbPb MC based on 2023 PbPb data

Alignment/CommonAlignment/python/tools/trackselectionRefitting.py

@@ -147,7 +147,8 @@ def getSequence(process, collection,
 
     if collection in ("ALCARECOTkAlMinBias", "generalTracks",
                       "ALCARECOTkAlMinBiasHI", "hiGeneralTracks",
-                      "ALCARECOTkAlJetHT", "ALCARECOTkAlDiMuonVertexTracks"):
+                      "ALCARECOTkAlJetHT", "ALCARECOTkAlDiMuonVertexTracks",
+                      "hltMergedTracks"):
         options["TrackSelector"]["Alignment"].update({
                 "ptMin": 1.0,
                 "pMin": 8.,

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py

@@ -49,13 +49,24 @@
 ## customizations for the pp_on_AA eras
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
-(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMinBiasHLT,
-                                      eventSetupPathsKey='TkAlMinBiasHI'
-)
-
 (pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMinBias,
                                     trackQualities = cms.vstring("highPurity")
 )
 
+pp_on_XeXe_2017.toModify(ALCARECOTkAlMinBiasHLT,
+                         eventSetupPathsKey='TkAlMinBiasHI')
+
+import HLTrigger.HLTfilters.triggerResultsFilterFromDB_cfi
+ALCARECOTkAlMinBiasTriggerResultsHI = HLTrigger.HLTfilters.triggerResultsFilterFromDB_cfi.triggerResultsFilterFromDB.clone(
+    eventSetupPathsKey = 'TkAlMinBiasHI',
+    usePathStatus = False,
+    hltResults = 'TriggerResults::HLT',
+    l1tResults = '', # leaving empty (not interested in L1T results)
+    throw = False # tolerate triggers stated above, but not available
+)
+
+seqALCARECOTkAlMinBiasHI = cms.Sequence(ALCARECOTkAlMinBiasTriggerResultsHI*~ALCARECOTkAlMinBiasNOTHLT+ALCARECOTkAlMinBiasDCSFilter+ALCARECOTkAlMinBias)
+pp_on_AA.toReplaceWith(seqALCARECOTkAlMinBias,seqALCARECOTkAlMinBiasHI)
+
 from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
 phase2_tracker.toModify(ALCARECOTkAlMinBias, etaMin = -4, etaMax = 4)

Alignment/OfflineValidation/python/TkAlAllInOneTool/JetHT_cfg.py

@@ -300,5 +300,3 @@
                          process.TrackRefitter                          + 
                          process.offlinePrimaryVerticesFromRefittedTrks +
                          process.jetHTAnalyzer)
-
-

Alignment/OfflineValidation/python/TkAlAllInOneTool/findAndChange.py

@@ -1,5 +1,6 @@
 import os
 from FWCore.ParameterSet.pfnInPath import pfnInPath
+import ROOT
 
 ##############################################
 def digest_path(path):
@@ -16,41 +17,38 @@ def digest_path(path):
     if not isinstance(path, str):
         return path
 
+    path_expanded = os.path.expandvars(path)
+
     # split path in folders
     protocol = ""
-    if "://" in path:
-        protocol = path.split("://")[0]+"://"
-        path_s = path.split("://")[1].split(os.sep)
+    if "://" in path_expanded:
+        protocol = path_expanded.split("://")[0]+"://"
+        path_d = path_expanded.split("://")[1]
+    elif ":" in path_expanded:
+        protocol = path_expanded.split(":")[0]+':'
+        path_d = ":".join(path_expanded.split(":")[1:])
+        # Similar to just `split(':')[1]`, but handles the case in which the rest of the path contains one or more ':'
     else:
-        path_s = path.split(os.sep)    
+        path_d = path_expanded
+
+    path_s = path_d.split(os.sep)
 
-    path_d_s = []
     placeholderIdx = []
     for ipart,part in enumerate(path_s):
-        # Look for environment variables such as $CMSSW_BASE
-        if part.startswith('$'):
-            env_var = part[1:].replace('{', '').replace('}', '')
-            path_d_s.append(os.environ[env_var])
         # Look for {} placeholder to be replaced internally 
-        elif "{}" in part:
+        if "{}" in part:
             placeholderIdx.append(ipart)
-            path_d_s.append(part)
-        else:
-            path_d_s.append(part)
 
     # re-join folders into full path 
     # only check path up to first placeholder occurence
-    path_d = os.path.join(*path_d_s)
     if len(placeholderIdx) > 0:
-        path_to_check = os.path.join(*path_d_s[:placeholderIdx[0]])
+        path_to_check = os.path.join(*path_s[:placeholderIdx[0]])
+        # re add front / if needed
+        if path_d.startswith(os.sep):
+            path_to_check = os.sep + path_to_check
     else:
         path_to_check = path_d
 
-    # re add front / if needed
-    if path.startswith(os.sep):
-        path_d = os.sep + path_d
-        path_to_check = os.sep + path_to_check
-
     # check for path to exist
     if not os.path.exists(path_to_check) and "." in os.path.splitext(path_to_check)[-1]:
         # in case of directory pointing to file try backup
@@ -64,14 +62,37 @@ def digest_path(path):
     # if all is OK return path to directory or file
     return path_d
 
+#########################################
+def get_root_color(value):
+#########################################
+    """
+       Returns an integer correspondig to the ROOT color
+    """
+    if(isinstance(value, str)):
+        if(value.isdigit()):
+            return int(value)
+        elif('-' in value):
+            pre, op, post = value.partition('-')
+            return get_root_color(pre.strip()) - get_root_color(post.strip())
+        elif('+' in value):
+            pre, op, post = value.partition('+')
+            return get_root_color(pre.strip()) + get_root_color(post.strip())
+        else:
+            return getattr(ROOT.EColor, value)
+    else:
+        return int(value)
+
 #########################################
 def get_all_keys(var):
 #########################################
     """
        Generate all keys for nested dictionary
+       - reserved keywords are not picked up
     """
+    reserved_keys = ["customrighttitle","title"]
     if hasattr(var,'items'):
         for k, v in var.items():
+            if k in reserved_keys: continue
             if isinstance(v, dict):
                 for result in get_all_keys(v):
                     yield result
@@ -97,10 +118,16 @@ def find_and_change(keys, var, alt=digest_path):
         for key in keys:
             for k, v in var.items():
                 if k == key:
-                    if isinstance(v,list):
-                        var[k] = [alt(_v) for _v in v]
-                    else:
-                        var[k] = alt(v)
+                    if "color" in key:
+                        if isinstance(v,list):
+                            var[k] = [get_root_color(_v) for _v in v]
+                        else:
+                            var[k] = get_root_color(v)
+                    else:    
+                        if isinstance(v,list):
+                            var[k] = [alt(_v) for _v in v]
+                        else:
+                            var[k] = alt(v)
                     yield alt(v)
                 if isinstance(v, dict):
                     for result in find_and_change([key], v):

Alignment/OfflineValidation/scripts/validateAlignments.py

@@ -214,6 +214,7 @@ def main():
             raise Exception("Unknown config extension '{}'. Please use json/yaml format!".format(args.config.split(".")[-1])) 
 
     ##Check for all paths in configuration and attempt to "digest" them
+    ##As a bonus, all ROOT colors are turned to the integer value
     for path in fnc.find_and_change(list(), config):
         if args.verbose and ("." in str(path) or "/" in str(path)):
             print("Digesting path: "+str(path))

Alignment/OfflineValidation/test/examples/DMR_testFeatures.yaml

@@ -0,0 +1,48 @@
+LFS: /eos/cms/store/group/alca_trackeralign/AlignmentValidation/AlignmentValidation/NewTool
+name: DMR_testFeatures
+
+alignments:
+    mp3707withSD:
+        color: kRed + 3  # ROOT color constants are translated into integers; additions and subtractions (the symbols '+' and '-') are evaulated
+        style: 2101
+        title: mp3707+SD
+        globaltag: 130X_dataRun3_HLT_v2
+        conditions:
+            TrackerAlignmentRcd:
+                connect: sqlite_file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_TRACKERALIGN/MP/MPproduction/mp3707/jobData/jobm/alignments_MP.db
+                tag: Alignments
+            TrackerSurfaceDeformationRcd:
+                connect: sqlite_file:/afs/cern.ch/cms/CAF/CMSALCA/ALCA_TRACKERALIGN/MP/MPproduction/mp3643/jobData/jobm4/alignments_MP.db
+                tag: Deformations
+
+validations:
+    DMR:
+        merge:
+            mergeJob:
+                methods:
+                - median
+                - rmsNorm
+                curves:
+                - plain
+                customrighttitle: "pp collisions (2023) 13.6 TeV"
+                legendoptions:
+                - mean
+                - rms
+                singles:
+                - singleJob
+                minimum: 10
+
+        single:
+            singleJob:
+                IOV:
+                - 370667
+                alignments:
+                - mp3707withSD
+                trackcollection: hltMergedTracks
+                vertexcollection: offlinePrimaryVertices
+                tthrbuilder: WithTrackAngle
+                usePixelQualityFlag: false
+                maxevents: 2000
+                maxtracks: 18000
+                dataset: /afs/cern.ch/cms/CAF/CMSALCA/ALCA_TRACKERALIGN/MP/MPproduction/datasetfiles/Collisions2023/310723/HLTMonitor_Run2023D-Express-v2_FEVTHLTALL/Dataset_Validation_HLTMonitor_Run2023D-Express-v2_FEVTHLTALL_since370667.txt
+                goodlumi: /afs/cern.ch/cms/CAF/CMSALCA/ALCA_TRACKERALIGN/MP/MPproduction/datasetfiles/Collisions2023/310723/Collisions23_13p6TeV_366403_370790_DCSOnly_TkPx.json

CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc

@@ -128,7 +128,7 @@ class SiPixelLorentzAnglePCLWorker : public DQMEDAnalyzer {
   // template stuff
   edm::ESWatcher<SiPixelTemplateDBObjectESProducerRcd> watchSiPixelTemplateRcd_;
   const SiPixelTemplateDBObject* templateDBobject_;
-  std::vector<SiPixelTemplateStore> thePixelTemp_;
+  const std::vector<SiPixelTemplateStore>* thePixelTemp_ = nullptr;
 
   LorentzAngleAnalysisTypeEnum analysisType_;
   std::string folder_;
@@ -195,6 +195,7 @@ class SiPixelLorentzAnglePCLWorker : public DQMEDAnalyzer {
   edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomEsToken_;
   edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topoEsToken_;
   edm::ESGetToken<SiPixelTemplateDBObject, SiPixelTemplateDBObjectESProducerRcd> siPixelTemplateEsToken_;
+  edm::ESGetToken<std::vector<SiPixelTemplateStore>, SiPixelTemplateDBObjectESProducerRcd> siPixelTemplateStoreEsToken_;
   edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topoPerEventEsToken_;
   edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomPerEventEsToken_;
   edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> magneticFieldToken_;
@@ -223,6 +224,7 @@ SiPixelLorentzAnglePCLWorker::SiPixelLorentzAnglePCLWorker(const edm::ParameterS
       geomEsToken_(esConsumes<edm::Transition::BeginRun>()),
       topoEsToken_(esConsumes<edm::Transition::BeginRun>()),
       siPixelTemplateEsToken_(esConsumes<edm::Transition::BeginRun>()),
+      siPixelTemplateStoreEsToken_(esConsumes<edm::Transition::BeginRun>()),
       topoPerEventEsToken_(esConsumes()),
       geomPerEventEsToken_(esConsumes()),
       magneticFieldToken_(esConsumes()) {
@@ -467,7 +469,7 @@ void SiPixelLorentzAnglePCLWorker::analyze(edm::Event const& iEvent, edm::EventS
 
           if (notInPCL_) {
             // fill the template from the store (from dqmBeginRun)
-            SiPixelTemplate theTemplate(thePixelTemp_);
+            SiPixelTemplate theTemplate(*thePixelTemp_);
 
             float locBx = (cotbeta < 0.) ? -1 : 1.;
             float locBz = (cotalpha < 0.) ? -locBx : locBx;
@@ -639,7 +641,7 @@ void SiPixelLorentzAnglePCLWorker::analyze(edm::Event const& iEvent, edm::EventS
 
           if (notInPCL_) {
             // fill the template from the store (from dqmBeginRun)
-            SiPixelTemplate theTemplate(thePixelTemp_);
+            SiPixelTemplate theTemplate(*thePixelTemp_);
 
             float locBx = (cotbeta < 0.) ? -1 : 1.;
             float locBz = (cotalpha < 0.) ? -locBx : locBx;
@@ -730,11 +732,7 @@ void SiPixelLorentzAnglePCLWorker::dqmBeginRun(edm::Run const& run, edm::EventSe
     // Initialize 1D templates
     if (watchSiPixelTemplateRcd_.check(iSetup)) {
       templateDBobject_ = &iSetup.getData(siPixelTemplateEsToken_);
-      if (!SiPixelTemplate::pushfile(*templateDBobject_, thePixelTemp_)) {
-        edm::LogError("SiPixelLorentzAnglePCLWorker")
-            << "Templates not filled correctly. Check the sqlite file. Using SiPixelTemplateDBObject version "
-            << (*templateDBobject_).version();
-      }
+      thePixelTemp_ = &iSetup.getData(siPixelTemplateStoreEsToken_);
     }
   }
 

CalibTracker/SiStripHitEfficiency/plugins/HitEff.cc

@@ -43,6 +43,7 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/Exception.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
 #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
@@ -81,7 +82,8 @@ HitEff::HitEff(const edm::ParameterSet& conf)
       trajTrackAsso_token_(consumes<TrajTrackAssociationCollection>(conf.getParameter<edm::InputTag>("trajectories"))),
       clusters_token_(
           consumes<edmNew::DetSetVector<SiStripCluster> >(conf.getParameter<edm::InputTag>("siStripClusters"))),
-      digis_token_(consumes<DetIdCollection>(conf.getParameter<edm::InputTag>("siStripDigis"))),
+      digisCol_token_(consumes(conf.getParameter<edm::InputTag>("siStripDigis"))),
+      digisVec_token_(consumes(conf.getParameter<edm::InputTag>("siStripDigis"))),
       trackerEvent_token_(consumes<MeasurementTrackerEvent>(conf.getParameter<edm::InputTag>("trackerEvent"))),
       topoToken_(esConsumes()),
       geomToken_(esConsumes()),
@@ -247,9 +249,19 @@ void HitEff::analyze(const edm::Event& e, const edm::EventSetup& es) {
   const MagneticField* magField_ = &es.getData(magFieldToken_);
 
   // get the list of module IDs with FED-detected errors
-  edm::Handle<DetIdCollection> fedErrorIds;
-  //e.getByLabel("siStripDigis", fedErrorIds );
-  e.getByToken(digis_token_, fedErrorIds);
+  //  - In Aug-2023, the data format was changed from DetIdCollection to DetIdVector.
+  //  - To provide some level of backward-compatibility,
+  //    the plugin checks for both types giving preference to the new format.
+  //  - If only the old format is available, the collection is
+  //    converted to the new format, then used downstream.
+  auto const& fedErrorIdsCol_h = e.getHandle(digisCol_token_);
+  auto const& fedErrorIdsVec_h = e.getHandle(digisVec_token_);
+  if (not fedErrorIdsCol_h.isValid() and not fedErrorIdsVec_h.isValid()) {
+    throw cms::Exception("InvalidProductSiStripDetIdsWithFEDErrors")
+        << "no valid product for SiStrip DetIds with FED errors (see parameter \"siStripDigis\"), "
+           "neither for new format (DetIdVector) nor old format (DetIdCollection)";
+  }
+  auto const& fedErrorIds = fedErrorIdsVec_h.isValid() ? *fedErrorIdsVec_h : fedErrorIdsCol_h->as_vector();
 
   edm::ESHandle<MeasurementTracker> measurementTrackerHandle = es.getHandle(measurementTkToken_);
 
@@ -976,8 +988,8 @@ void HitEff::analyze(const edm::Event& e, const edm::EventSetup& es) {
               }
 
               //check for FED-detected errors and include those in SiStripQualBad
-              for (unsigned int ii = 0; ii < fedErrorIds->size(); ii++) {
-                if (iidd == (*fedErrorIds)[ii].rawId())
+              for (unsigned int ii = 0; ii < fedErrorIds.size(); ii++) {
+                if (iidd == fedErrorIds[ii].rawId())
                   SiStripQualBad = 1;
               }
 

CalibTracker/SiStripHitEfficiency/plugins/HitEff.h

@@ -8,6 +8,7 @@
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/DetId/interface/DetIdCollection.h"
+#include "DataFormats/DetId/interface/DetIdVector.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementError.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
@@ -80,7 +81,8 @@ class HitEff : public edm::one::EDAnalyzer<edm::one::SharedResources> {
   const edm::EDGetTokenT<std::vector<Trajectory> > trajectories_token_;
   const edm::EDGetTokenT<TrajTrackAssociationCollection> trajTrackAsso_token_;
   const edm::EDGetTokenT<edmNew::DetSetVector<SiStripCluster> > clusters_token_;
-  const edm::EDGetTokenT<DetIdCollection> digis_token_;
+  const edm::EDGetTokenT<DetIdCollection> digisCol_token_;
+  const edm::EDGetTokenT<DetIdVector> digisVec_token_;
   const edm::EDGetTokenT<MeasurementTrackerEvent> trackerEvent_token_;
 
   // ES tokens

CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc

@@ -23,7 +23,6 @@
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/DetId/interface/DetIdCollection.h"
 #include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"