Migration of input collection parameters to untracked for CTPPS and DTMonitorModule

Alignment/CommonAlignmentProducer/python/ALCARECOMuAlCalIsolatedMu_Output_cff.py

@@ -1,5 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
+
 # AlCaReco output for track based muon alignment using muons from collisions
 OutALCARECOMuAlCalIsolatedMu_noDrop = cms.PSet(
     SelectEvents = cms.untracked.PSet(
@@ -16,6 +17,8 @@
         'keep *_dt4DSegments_*_*', 
         'keep *_csc2DRecHits_*_*', 
         'keep *_cscSegments_*_*', 
+	'keep *_gemRecHits_*_*', 
+	'keep *_gemSegments_*_*',
         'keep *_rpcRecHits_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',

Alignment/CommonAlignmentProducer/python/ALCARECOMuAlGlobalCosmicsInCollisions_Output_cff.py

@@ -16,6 +16,8 @@
 	'keep *_dt4DSegments_*_*',
 	'keep *_csc2DRecHits_*_*',
 	'keep *_cscSegments_*_*',
+        'keep *_gemRecHits_*_*',
+        'keep *_gemSegments_*_*',
 	'keep *_rpcRecHits_*_*',
 	'keep L1AcceptBunchCrossings_*_*_*',
 	'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',

Alignment/CommonAlignmentProducer/python/ALCARECOMuAlGlobalCosmics_Output_cff.py

@@ -19,6 +19,8 @@
 	'keep *_dt4DSegments_*_*',
 	'keep *_csc2DRecHits_*_*',
 	'keep *_cscSegments_*_*',
+        'keep *_gemRecHits_*_*',
+        'keep *_gemSegments_*_*',
 	'keep *_rpcRecHits_*_*',
 	'keep L1AcceptBunchCrossings_*_*_*',
 	'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',

CondCore/Utilities/scripts/conddb

@@ -2555,16 +2555,16 @@ def dump(args):
             filter(IOV.tag_name == name).\
             distinct():
             if args.format == 'xml':
-                xmlProcessor.payload2xml(session, payload)
+                xmlProcessor.payload2xml(session, payload, args.destfile)
             else:
                 _dump_payload(session, payload, args.loadonly)
 
-    elif args.type == 'gt' and _exists(session, conddb.GlobalTag.name, name) != None:
+    elif args.type == 'gt' and _exists(session, GlobalTag.name, name) != None:
         for payload, in session.query(IOV.payload_hash).\
             filter(GlobalTagMap.global_tag_name == name, IOV.tag_name == GlobalTagMap.tag_name).\
             distinct():
             if args.format == 'xml':
-                xmlProcessor.payload2xml(session, payload)
+                xmlProcessor.payload2xml(session, payload, args.destfile)
             else:
                 _dump_payload(session, payload, args.loadonly)
 

CondCore/Utilities/test/test_conddb.sh

@@ -43,7 +43,12 @@ conddb diffGlobalTagsAtRun -R 120X_mcRun3_2021_realistic_v1 -T 120X_mcRun3_2021_
 echo -ne '\n\n'
 
 echo "===========> testing conddb dump"
-conddb dump 4b97f78682aac6254bbcba54cedbde468202bf5b || die 'failed comparing metadata with reference' $?
+conddb dump 4b97f78682aac6254bbcba54cedbde468202bf5b || die 'failed conddb dump payload' $?
+conddb dump 4b97f78682aac6254bbcba54cedbde468202bf5b --destfile payload_dump.xml || die 'failed conddb dump payload to file' $?
+conddb dump SiPixelQuality_phase1_2021_v1 || die 'failed conddb dump tag' $?
+conddb dump SiPixelQuality_phase1_2021_v1 --destfile tag_dump.xml || die 'failed conddb dump tag to file' $?
+conddb dump Test_CMSSW_IB_unitTest_v1 || die 'failed conddb dump gt' $?
+conddb dump Test_CMSSW_IB_unitTest_v1 --destfile gt_dump.xml || die 'failed conddb dump gt to file' $?
 echo -ne '\n\n'
 
 #conddb showFCSR || die 'failed conddb showFCSR' $?  # the FCSR is not always a real run...

CondFormats/Common/test/DropBoxMetadataReader.py

@@ -47,8 +47,7 @@
                                     "SiPixelQualityFromDbRcd_other",
                                     "SiPixelLorentzAngleRcd",
                                     "CTPPSRPAlignmentCorrectionsDataRcd",
-                                    "PPSTimingCalibrationRcd",
-                                    "PPSTimingCalibrationRcd_Sampic"
+                                    "PPSTimingCalibrationRcd"
                                     ) # same strings as fType
                                   )
 

CondFormats/Common/test/ProduceDropBoxMetadata.py

@@ -228,13 +228,7 @@ def encodeJsonInString(filename):
                                                                FileClass           = cms.untracked.string("ALCA"),
                                                                prodMetaData        = cms.untracked.string(PPSTimingCalibrationRcd_prod_str),
                                                                prepMetaData        = cms.untracked.string(PPSTimingCalibrationRcd_prep_str),
-                                                               ),
-                                                      cms.PSet(record              = cms.untracked.string('PPSTimingCalibrationRcd_Sampic'),
-                                                               Source              = cms.untracked.string("AlcaHarvesting"),
-                                                               FileClass           = cms.untracked.string("ALCA"),
-                                                               prodMetaData        = cms.untracked.string(PPSTimingCalibrationRcd_Sampic_prod_str),
-                                                               prepMetaData        = cms.untracked.string(PPSTimingCalibrationRcd_Sampic_prep_str),
-                                                               ),
+                                                               )
                                                       ),
                                   # this boolean will read the content of whichever payload is available and print its content to stoutput
                                   # set this to false if you write out a sqlite.db translating the json's into a payload

CondFormats/SiPixelTransient/src/SiPixelTemplate.cc

@@ -1328,6 +1328,12 @@ void SiPixelTemplate::postInit(std::vector<SiPixelTemplateStore>& thePixelTemp_)
 bool SiPixelTemplate::interpolate(int id, float cotalpha, float cotbeta, float locBz, float locBx) {
   // Interpolate for a new set of track angles
 
+  //check for nan's
+  if (!edm::isFinite(cotalpha) || !edm::isFinite(cotbeta)) {
+    success_ = false;
+    return success_;
+  }
+
   // Local variables
   int i, j;
   int ilow, ihigh, iylow, iyhigh, Ny, Nxx, Nyx, imidy, imaxx;
@@ -1393,12 +1399,6 @@ bool SiPixelTemplate::interpolate(int id, float cotalpha, float cotbeta, float l
       throw cms::Exception("DataCorrupt")
           << "SiPixelTemplate::interpolate can't find needed template ID = " << id << std::endl;
     }
-
-    //check for nan's
-    if (!edm::isFinite(cotalpha) || !edm::isFinite(cotbeta)) {
-      success_ = false;
-      return success_;
-    }
 #else
     assert(index_id_ >= 0 && index_id_ < (int)thePixelTemp_.size());
 #endif

CondFormats/SiPixelTransient/src/SiPixelTemplate2D.cc

@@ -626,6 +626,12 @@ bool SiPixelTemplate2D::getid(int id) {
 bool SiPixelTemplate2D::interpolate(int id, float cotalpha, float cotbeta, float locBz, float locBx) {
   // Interpolate for a new set of track angles
 
+  //check for nan's
+  if (!edm::isFinite(cotalpha) || !edm::isFinite(cotbeta)) {
+    success_ = false;
+    return success_;
+  }
+
   // Local variables
 
   float acotb, dcota, dcotb;
@@ -680,12 +686,6 @@ bool SiPixelTemplate2D::interpolate(int id, float cotalpha, float cotbeta, float
 #ifndef SI_PIXEL_TEMPLATE_STANDALONE
       throw cms::Exception("DataCorrupt")
           << "SiPixelTemplate2D::illegal subdetector ID = " << thePixelTemp_[index_id_].head.Dtype << std::endl;
-
-      //check for nan's
-      if (!edm::isFinite(cotalpha) || !edm::isFinite(cotbeta)) {
-        success_ = false;
-        return success_;
-      }
 #else
       std::cout << "SiPixelTemplate:2D:illegal subdetector ID = " << thePixelTemp_[index_id_].head.Dtype << std::endl;
 #endif

CondTools/RunInfo/plugins/BuildFile.xml

@@ -46,3 +46,7 @@
 <library file="XangleBetaStarFilter.cc">
   <flags EDM_PLUGIN="1"/>
 </library>
+
+<library file="L1TriggerScalerESAnalyzer.cc" name="CondToolsL1TriggerScalerESAnalyzer">
+  <flags EDM_PLUGIN="1"/>
+</library>

CondTools/RunInfo/plugins/L1TriggerScalerESAnalyzer.cc

@@ -2,86 +2,72 @@
 #include <string>
 #include <iostream>
 #include <map>
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
 #include "CondFormats/RunInfo/interface/L1TriggerScaler.h"
 
 #include "CondFormats/DataRecord/interface/L1TriggerScalerRcd.h"
 
-using namespace std;
-
-
-
-
-
-namespace edmtest
-{
-  class L1TriggerScalerESAnalyzer : public edm::EDAnalyzer
-  {
+namespace edmtest {
+  class L1TriggerScalerESAnalyzer : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   public:
-    explicit  L1TriggerScalerESAnalyzer(edm::ParameterSet const& p) 
-    { 
-      std::cout<<"L1TriggerScalerESAnalyzer"<<std::endl;
+    explicit L1TriggerScalerESAnalyzer(edm::ParameterSet const& p)
+        : scaler1Token_(esConsumes<L1TriggerScaler, L1TriggerScalerRcd, edm::Transition::BeginRun>()),
+          scaler2Token_(esConsumes<L1TriggerScaler, L1TriggerScalerRcd>()) {
+      edm::LogVerbatim("L1TriggerScaler") << "L1TriggerScalerESAnalyzer";
     }
-    explicit  L1TriggerScalerESAnalyzer(int i) 
-    { std::cout<<"L1TriggerScalerESAnalyzer "<<i<<std::endl; }
-    virtual ~L1TriggerScalerESAnalyzer() {  
-      std::cout<<"~L1TriggerScalerESAnalyzer "<<std::endl;
+    explicit L1TriggerScalerESAnalyzer(int i)
+        : scaler1Token_(esConsumes<L1TriggerScaler, L1TriggerScalerRcd, edm::Transition::BeginRun>()),
+          scaler2Token_(esConsumes<L1TriggerScaler, L1TriggerScalerRcd>()) {
+      edm::LogVerbatim("L1TriggerScaler") << "L1TriggerScalerESAnalyzer " << i;
     }
-     virtual void beginJob();
-     virtual void beginRun(const edm::Run&, const edm::EventSetup& context);
-    virtual void analyze(const edm::Event& e, const edm::EventSetup& c);
+    ~L1TriggerScalerESAnalyzer() override { edm::LogVerbatim("L1TriggerScaler") << "~L1TriggerScalerESAnalyzer "; }
+    void beginJob() override;
+    void beginRun(const edm::Run&, const edm::EventSetup& context) override;
+    void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+    void endRun(const edm::Run&, const edm::EventSetup& context) override {}
+
   private:
+    const edm::ESGetToken<L1TriggerScaler, L1TriggerScalerRcd> scaler1Token_;
+    const edm::ESGetToken<L1TriggerScaler, L1TriggerScalerRcd> scaler2Token_;
   };
-
-
- void
-  L1TriggerScalerESAnalyzer::beginRun(const edm::Run&, const edm::EventSetup& context){
-    std::cout<<"###L1TriggerScalerESAnalyzer::beginRun"<<std::endl;
-    edm::ESHandle<L1TriggerScaler> L1TriggerScaler_lumiarray;
-    std::cout<<"got eshandle"<<std::endl;
-    context.get<L1TriggerScalerRcd>().get(L1TriggerScaler_lumiarray);
-    std::cout<<"got data"<<std::endl;
+
+  void L1TriggerScalerESAnalyzer::beginRun(const edm::Run&, const edm::EventSetup& context) {
+    edm::LogVerbatim("L1TriggerScaler") << "###L1TriggerScalerESAnalyzer::beginRun";
+    const edm::ESHandle<L1TriggerScaler>& L1TriggerScaler_lumiarray = context.getHandle(scaler1Token_);
+    edm::LogVerbatim("L1TriggerScaler") << " got eshandle with flag " << L1TriggerScaler_lumiarray.isValid()
+                                        << " got data";
   }
-
-  void
-  L1TriggerScalerESAnalyzer::beginJob(){
-    std::cout<<"###L1TriggerScalerESAnalyzer::beginJob"<<std::endl;
-
+
+  void L1TriggerScalerESAnalyzer::beginJob() {
+    edm::LogVerbatim("L1TriggerScaler") << "###L1TriggerScalerESAnalyzer::beginJob";
   }
-
-
-  void
-   L1TriggerScalerESAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& context){
+
+  void L1TriggerScalerESAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& context) {
     using namespace edm::eventsetup;
-    std::cout<<"###L1TriggerScalerESAnalyzer::analyze"<<std::endl;
-     
+    edm::LogVerbatim("L1TriggerScaler") << "###L1TriggerScalerESAnalyzer::analyze";
+
     // Context is not used.
-    std::cout <<" I AM IN RUN NUMBER "<<e.id().run() <<std::endl;
-    std::cout <<" ---EVENT NUMBER "<<e.id().event() <<std::endl;
-    edm::eventsetup::EventSetupRecordKey recordKey(edm::eventsetup::EventSetupRecordKey::TypeTag::findType("L1TriggerScalerRcd"));
-    if( recordKey.type() == edm::eventsetup::EventSetupRecordKey::TypeTag()) {
+    edm::LogVerbatim("L1TriggerScaler") << " I AM IN RUN NUMBER " << e.id().run();
+    edm::LogVerbatim("L1TriggerScaler") << " ---EVENT NUMBER " << e.id().event();
+    edm::eventsetup::EventSetupRecordKey recordKey(
+        edm::eventsetup::EventSetupRecordKey::TypeTag::findType("L1TriggerScalerRcd"));
+    if (recordKey.type() == edm::eventsetup::EventSetupRecordKey::TypeTag()) {
       //record not found
-      std::cout <<"Record \"L1TriggerScalerRcd"<<"\" does not exist "<<std::endl;
+      edm::LogVerbatim("L1TriggerScaler") << "Record \"L1TriggerScalerRcd"
+                                          << "\" does not exist ";
     }
-    edm::ESHandle<L1TriggerScaler> l1tr;
-    std::cout<<"got eshandle"<<std::endl;
-    context.get<L1TriggerScalerRcd>().get(l1tr);
-    std::cout<<"got context"<<std::endl;
-    const L1TriggerScaler* l1lumiscaler=l1tr.product();
-    std::cout<<"got L1TriggerScaler* "<< std::endl;
+    const edm::ESHandle<L1TriggerScaler>& l1tr = context.getHandle(scaler2Token_);
+    edm::LogVerbatim("L1TriggerScaler") << " got eshandle\n got context";
+    const L1TriggerScaler* l1lumiscaler = l1tr.product();
+    edm::LogVerbatim("L1TriggerScaler") << "got L1TriggerScaler* ";
 
-    /* let's user the printValues method
-    std::cout<< "print result" << std::endl;
-    l1lumiscaler->printAllValues();
-    std::cout<< "print finished" << std::endl;
-    */
-std::cout<< "print  result" << std::endl;
+    edm::LogVerbatim("L1TriggerScaler") << "print  result";
     l1lumiscaler->printRunValue();
     l1lumiscaler->printLumiSegmentValues();
     l1lumiscaler->printFormat();
@@ -95,50 +81,7 @@ std::cout<< "print  result" << std::endl;
     l1lumiscaler->printGTPartition0TriggerRates();
     l1lumiscaler->printGTPartition0DeadTime();
     l1lumiscaler->printGTPartition0DeadTimeRatio();
-    std::cout<<  "print  finished" << std::endl;
-
-
-
-   /*
-    for(std::vector<L1TriggerScaler::Lumi>::const_iterator it=l1lumiscaler->m_run.begin(); it!=l1lumiscaler->m_run.end(); ++it){
-      std::cout << "  run:  " <<it->m_rn<<
-	"\nlumisegment: "  << it->m_lumisegment<<std::endl;  
-
-
-
-      for(size_t i=0; i<it->m_GTAlgoRates.size(); i++ ){ 
-	std::cout << "m_GTAlgoRates["<<i<<"] = "<< it->m_GTAlgoRates[i]<<std::endl;  
-      }
-     for(size_t i=0; i<it->m_GTAlgoPrescaling.size(); i++ ){ 
-       std::cout << "m_GTAlgoPrescaling["<<i<<"] = "<< it->m_GTAlgoPrescaling[i]<<std::endl;  
-      } 
-for(size_t i=0; i<it->m_GTTechCounts.size(); i++ ){ 
-       std::cout << " m_GTTechCounts["<<i<<"] = "<< it->m_GTTechCounts[i]<<std::endl;  
-      } 
-
-for(size_t i=0; i<it->m_GTTechRates.size(); i++ ){ 
-       std::cout << " m_GTTechRates["<<i<<"] = "<< it->m_GTTechRates[i]<<std::endl;  
-      } 
-for(size_t i=0; i<it->m_GTTechPrescaling.size(); i++ ){ 
-       std::cout << " m_GTTechPrescaling["<<i<<"] = "<< it->m_GTTechPrescaling[i]<<std::endl;  
-      } 
-for(size_t i=0; i<it->m_GTPartition0TriggerCounts.size(); i++ ){ 
-       std::cout << " m_GTPartition0TriggerCounts["<<i<<"] = "<< it->m_GTPartition0TriggerCounts[i]<<std::endl;  
-      } 
-for(size_t i=0; i<it->m_GTPartition0TriggerRates.size(); i++ ){ 
-       std::cout << " m_GTPartition0TriggerRates["<<i<<"] = "<< it->m_GTPartition0TriggerRates[i]<<std::endl;  
-      } 
-
-for(size_t i=0; i<it->m_GTPartition0DeadTime.size(); i++ ){ 
-       std::cout << " m_GTPartition0DeadTime["<<i<<"] = "<< it->m_GTPartition0DeadTime[i]<<std::endl;  
-      }
-for(size_t i=0; i<it->m_GTPartition0DeadTimeRatio.size(); i++ ){ 
-       std::cout << " m_GTPartition0DeadTimeRatio["<<i<<"] = "<< it->m_GTPartition0DeadTimeRatio[i]<<std::endl;  
-      }
-   }
-    */
+    edm::LogVerbatim("L1TriggerScaler") << "print  finished";
   }
   DEFINE_FWK_MODULE(L1TriggerScalerESAnalyzer);
-}
-
-
+}  // namespace edmtest

CondTools/SiStrip/test/SiStripDetVOffFakeBuilder_cfg.py

@@ -33,7 +33,7 @@
 
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.autoCond import autoCond
-process.GlobalTag.globaltag = autoCond['run2_design']
+process.GlobalTag.globaltag = autoCond['phase1_2022_design']
 print("taking geometry from %s" % process.GlobalTag.globaltag.value())
 process.load("Configuration.StandardSequences.GeometryDB_cff")
 

CondTools/SiStrip/test/SiStripFedCablingBuilder_cfg.py

@@ -36,7 +36,7 @@
 
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.autoCond import autoCond
-process.GlobalTag.globaltag = autoCond['run2_design']
+process.GlobalTag.globaltag = autoCond['phase1_2022_design']
 print("taking geometry from %s" % process.GlobalTag.globaltag.value())
 process.load("Configuration.StandardSequences.GeometryDB_cff")
 

CondTools/SiStrip/test/SiStripFedCablingReader_cfg.py

@@ -34,7 +34,7 @@
 
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.autoCond import autoCond
-process.GlobalTag.globaltag = autoCond['run2_design']
+process.GlobalTag.globaltag = autoCond['phase1_2022_design']
 print("taking geometry from %s" % process.GlobalTag.globaltag.value())
 process.load("Configuration.StandardSequences.GeometryDB_cff")
 

Configuration/Eras/python/Era_Phase2C18I13M9_cff.py

@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose
+
+Phase2C18I13M9 = cms.ModifierChain(Phase2C17I13M9, phase2_hfnose)