cms-sw · kaderci-johannes · Apr 25, 2024 · Apr 20, 2024 · May 10, 2024 · May 10, 2024
diff --git a/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml b/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml
@@ -53,5 +53,6 @@
 </library>
 
 <library file="LSNumberFilter.cc" name="AlignmentCommonAlignmentProducerFilter">
+  <use name="HLTrigger/HLTcore"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Alignment/CommonAlignmentProducer/plugins/LSNumberFilter.cc b/Alignment/CommonAlignmentProducer/plugins/LSNumberFilter.cc
@@ -1,10 +1,11 @@
-#include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/Run.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/Run.h"
+#include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
 //
 // class declaration
@@ -13,29 +14,58 @@
 class LSNumberFilter : public edm::stream::EDFilter<> {
 public:
   explicit LSNumberFilter(const edm::ParameterSet&);
-  ~LSNumberFilter() override;
+  ~LSNumberFilter() override = default;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
+  void beginRun(edm::Run const&, edm::EventSetup const&) override;
   bool filter(edm::Event&, const edm::EventSetup&) override;
-  unsigned int minLS;
+  bool is_HLT_vetoed_;
+  const unsigned int minLS_;
+  const std::vector<std::string> veto_HLT_Menu_;
+  HLTConfigProvider hltConfig_;
 };
 
-LSNumberFilter::LSNumberFilter(const edm::ParameterSet& iConfig)
-    : minLS(iConfig.getUntrackedParameter<unsigned>("minLS", 21)) {}
+void LSNumberFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.setComment("Filters the first minLS lumisections and reject the run according to the HLT menu name");
+  desc.addUntracked<unsigned int>("minLS", 21)->setComment("first LS to accept");
+  desc.addUntracked<std::vector<std::string>>("veto_HLT_Menu", {})->setComment("list of HLT menus to reject");
+  descriptions.addWithDefaultLabel(desc);
+}
 
-LSNumberFilter::~LSNumberFilter() {}
+LSNumberFilter::LSNumberFilter(const edm::ParameterSet& iConfig)
+    : minLS_(iConfig.getUntrackedParameter<unsigned>("minLS", 21)),
+      veto_HLT_Menu_(iConfig.getUntrackedParameter<std::vector<std::string>>("veto_HLT_Menu")) {}
 
 //
 // member functions
 //
 
 // ------------ method called on each new Event  ------------
 bool LSNumberFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) {
-  if (iEvent.luminosityBlock() < minLS)
+  if ((iEvent.luminosityBlock() < minLS_) || is_HLT_vetoed_) {
     return false;
+  }
 
   return true;
 }
 
+void LSNumberFilter::beginRun(edm::Run const& iRun, edm::EventSetup const& iSetup) {
+  bool changed{false};
+  hltConfig_.init(iRun, iSetup, "HLT", changed);
+  is_HLT_vetoed_ = false;
+  for (const auto& veto : veto_HLT_Menu_) {
+    std::size_t found = hltConfig_.tableName().find(veto);
+    if (found != std::string::npos) {
+      is_HLT_vetoed_ = true;
+      edm::LogWarning("LSNumberFilter") << "Detected " << veto
+                                        << " in HLT Config tableName(): " << hltConfig_.tableName()
+                                        << "; Events of this run will be ignored" << std::endl;
+      break;
+    }
+  }
+}
 //define this as a plug-in
 DEFINE_FWK_MODULE(LSNumberFilter);
diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAli0T_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAli0T_cff.py
@@ -151,7 +151,7 @@
 
 
 seqALCARECOPromptCalibProdSiPixelAli = cms.Sequence(ALCARECOTkAlMinBiasFilterForSiPixelAli*
-                                                    lsNumberFilter*
+                                                    LSNumberFilter*
                                                     offlineBeamSpot*
                                                     SiPixelAliHighPuritySelector*
                                                     SiPixelAliTrackRefitter0*

diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHGDiMuon_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHGDiMuon_cff.py
@@ -123,7 +123,7 @@
                                                          fileBlobLabel = cms.string(''))
 
 seqALCARECOPromptCalibProdSiPixelAliHGDiMu = cms.Sequence(ALCARECOTkAlZMuMuFilterForSiPixelAli*
-                                                          lsNumberFilter*
+                                                          LSNumberFilter*
                                                           offlineBeamSpot*
                                                           SiPixelAliHighPuritySelectorHGDimuon*
                                                           SiPixelAliTrackRefitterHGDimuon0*

diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHG_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHG_cff.py
@@ -64,7 +64,7 @@
                                                     fileBlobLabel = cms.string(''))
 
 seqALCARECOPromptCalibProdSiPixelAliHG = cms.Sequence(ALCARECOTkAlMinBiasFilterForSiPixelAliHG*
-                                                      lsNumberFilter*
+                                                      LSNumberFilter*
                                                       offlineBeamSpot*
                                                       SiPixelAliHighPuritySelectorHG*
                                                       SiPixelAliTrackRefitterHG0*

diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAli_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAli_cff.py
@@ -149,7 +149,7 @@
 
 
 seqALCARECOPromptCalibProdSiPixelAli = cms.Sequence(ALCARECOTkAlMinBiasFilterForSiPixelAli*
-                                                    lsNumberFilter*
+                                                    LSNumberFilter*
                                                     offlineBeamSpot*
                                                     SiPixelAliHighPuritySelector*
                                                     SiPixelAliTrackRefitter0*

diff --git a/Alignment/CommonAlignmentProducer/python/LSNumberFilter_cfi.py b/Alignment/CommonAlignmentProducer/python/LSNumberFilter_cfi.py
@@ -1,5 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
-lsNumberFilter = cms.EDFilter("LSNumberFilter",
-                              minLS = cms.untracked.uint32(21)
-                              )
+from Alignment.CommonAlignmentProducer.lsNumberFilter_cfi import lsNumberFilter
+LSNumberFilter = lsNumberFilter.clone(
+    minLS = 21,
+    veto_HLT_Menu = [
+        "LumiScan",
+        "PPS",
+        "ECALTiming"]
+    )
diff --git a/Alignment/CommonAlignmentProducer/python/TkAlMuonSelectors_cfi.py b/Alignment/CommonAlignmentProducer/python/TkAlMuonSelectors_cfi.py
@@ -16,3 +16,16 @@
     cut = cms.string('(isolationR03().sumPt + isolationR03().emEt + isolationR03().hadEt)/pt  < 0.15'),
     filter = cms.bool(True)
 )
+
+## FIXME: these are needed for ALCARECO production in CMSSW_14_0_X
+## to avoid loosing in efficiency. To be reviewed after muon reco is fixed
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(TkAlGoodIdMuonSelector,
+                       cut = '(abs(eta) < 2.5 & isGlobalMuon & isTrackerMuon & numberOfMatches > 1 & globalTrack.hitPattern.numberOfValidMuonHits > 0 &  globalTrack.normalizedChi2 < 20.) ||'  # regular selection
+                       '(abs(eta) > 2.3 & abs(eta) < 3.0 & numberOfMatches >= 0 & isTrackerMuon)'   # to recover GE0 tracks
+                       )
+
+phase2_common.toModify(TkAlRelCombIsoMuonSelector,
+                       cut = '(isolationR03().sumPt)/pt < 0.1' # only tracker isolation
+                       )
diff --git a/Alignment/CommonAlignmentProducer/python/customizeLSNumberFilterForRelVals.py b/Alignment/CommonAlignmentProducer/python/customizeLSNumberFilterForRelVals.py
@@ -6,8 +6,8 @@
 ##
 
 def doNotFilterLS(process):
-    if hasattr(process,'lsNumberFilter'):
-        process.lsNumberFilter.minLS = 1
+    if hasattr(process,'LSNumberFilter'):
+        process.LSNumberFilter.minLS = 1
     return process
 
 ##

diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml b/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>
diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/align_params_cff.py b/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",
+    )
+)
diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/convertMPresToDB_cfg.py b/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')
+                                                                     )
+                                                            )
+                                          )
diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/test_pede.py b/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 ##

diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/test_pede.sh b/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

diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/test_pedeConversion.sh b/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' $?
diff --git a/Alignment/OfflineValidation/bin/DMRtrends.cc b/Alignment/OfflineValidation/bin/DMRtrends.cc
@@ -136,17 +136,17 @@ int trends(int argc, char *argv[]) {
 
   for (auto const &Variable : validation.get_child("Variables")) {
     vector<tuple<TString, TString, float, float>> DMRs{{"mu", "#mu [#mum]", -6, 6},
-                                                       {"sigma", "#sigma_{#mu} [#mum]", -15, 15},
+                                                       {"sigma", "#sigma_{#mu} [#mum]", -5, 5},
                                                        {"muplus", "#mu outward [#mum]", -6, 6},
-                                                       {"sigmaplus", "#sigma_{#mu outward} [#mum]", -15, 15},
+                                                       {"sigmaplus", "#sigma_{#mu outward} [#mum]", -5, 5},
                                                        {"muminus", "#mu inward [#mum]", -6, 6},
-                                                       {"sigmaminus", "#sigma_{#mu inward} [#mum]", -15, 15},
-                                                       {"deltamu", "#Delta#mu [#mum]", -15, 15},
-                                                       {"sigmadeltamu", "#sigma_{#Delta#mu} [#mum]", -15, 15},
-                                                       {"musigma", "#mu [#mum]", -6, 6},
-                                                       {"muplussigmaplus", "#mu outward [#mum]", -15, 15},
-                                                       {"muminussigmaminus", "#mu inward [#mum]", -15, 15},
-                                                       {"deltamusigmadeltamu", "#Delta#mu [#mum]", -15, 15}};
+                                                       {"sigmaminus", "#sigma_{#mu inward} [#mum]", -5, 5},
+                                                       {"deltamu", "#Delta#mu [#mum]", -5, 5},
+                                                       {"sigmadeltamu", "#sigma_{#Delta#mu} [#mum]", -5, 5},
+                                                       {"musigma", "#mu [#mum]", -2, 4},
+                                                       {"muplussigmaplus", "#mu outward [#mum]", -5, 5},
+                                                       {"muminussigmaminus", "#mu inward [#mum]", -5, 5},
+                                                       {"deltamusigmadeltamu", "#Delta#mu [#mum]", -5, 10}};
 
     if (Variable.second.get_value<string>() == "DrmsNR") {
       DMRs = {{"mu", "RMS(x'_{pred}-x'_{hit} /#sigma)", -1.2, 1.2},