Adding HZZ electron MVA ID

Alignment/CommonAlignment/scripts/tkal_create_file_lists.py

@@ -916,6 +916,7 @@ def das_client(query, check_key = None):
     """
 
     error = True
+    das_data = {'status': 'error'}
     for i in range(5):         # maximum of 5 tries
         try:
             das_data = cmssw_das_client.get_data(query, limit = 0)
@@ -924,6 +925,7 @@ def das_client(query, check_key = None):
                 continue
         except ValueError as e:
             if str(e) == "No JSON object could be decoded":
+                das_data['reason'] = str(e)
                 continue
 
         if das_data["status"] == "ok":
@@ -945,7 +947,7 @@ def das_client(query, check_key = None):
     if das_data["status"] == "error":
         print_msg("DAS query '{}' failed 5 times. "
                   "The last time for the the following reason:".format(query))
-        print(das_data["reason"])
+        print(das_data.get("reason", "ERROR:UNKNOWN"))
         sys.exit(1)
     return das_data["data"]
 

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py

@@ -0,0 +1,19 @@
+import FWCore.ParameterSet.Config as cms
+
+# AlCaReco for track based alignment using JetHT events
+OutALCARECOTkAlJetHT_noDrop = cms.PSet(
+    SelectEvents = cms.untracked.PSet(
+        SelectEvents = cms.vstring('pathALCARECOTkAlJetHT')
+    ),
+    outputCommands = cms.untracked.vstring(
+        'keep *_ALCARECOTkAlJetHT_*_*', 
+        'keep L1AcceptBunchCrossings_*_*_*',
+        'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',
+        'keep *_TriggerResults_*_*',
+        'keep DcsStatuss_scalersRawToDigi_*_*',
+        'keep *_offlinePrimaryVertices_*_*',
+        'keep *_offlineBeamSpot_*_*')
+)
+
+OutALCARECOTkAlJetHT = OutALCARECOTkAlJetHT_noDrop.clone()
+OutALCARECOTkAlJetHT.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_cff.py

@@ -0,0 +1,46 @@
+# AlCaReco for track based alignment using min. bias events
+import FWCore.ParameterSet.Config as cms
+
+import HLTrigger.HLTfilters.hltHighLevel_cfi
+ALCARECOTkAlJetHTHLT = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone(
+    andOr = True, ## choose logical OR between Triggerbits
+    eventSetupPathsKey = 'TkAlJetHTHLT',
+    throw = False # tolerate triggers stated above, but not available
+    )
+
+# DCS partitions
+# "EBp","EBm","EEp","EEm","HBHEa","HBHEb","HBHEc","HF","HO","RPC"
+# "DT0","DTp","DTm","CSCp","CSCm","CASTOR","TIBTID","TOB","TECp","TECm"
+# "BPIX","FPIX","ESp","ESm"
+import DPGAnalysis.Skims.skim_detstatus_cfi
+ALCARECOTkAlJetHTDCSFilter = DPGAnalysis.Skims.skim_detstatus_cfi.dcsstatus.clone(
+    DetectorType = cms.vstring('TIBTID','TOB','TECp','TECm','BPIX','FPIX'),
+    ApplyFilter  = cms.bool(True),
+    AndOr        = cms.bool(True),
+    DebugOn      = cms.untracked.bool(False)
+)
+
+import FWCore.Modules.preScaler_cfi
+ALCARECOTkAlJetHTPrescaler = FWCore.Modules.preScaler_cfi.preScaler.clone(
+    prescaleFactor = cms.int32(10), # selects one event out of 10
+    prescaleOffset = cms.int32(1)
+)
+
+import Alignment.CommonAlignmentProducer.AlignmentTrackSelector_cfi
+ALCARECOTkAlJetHT = Alignment.CommonAlignmentProducer.AlignmentTrackSelector_cfi.AlignmentTrackSelector.clone(
+    filter = True, ##do not store empty events	
+    applyBasicCuts = True,
+    ptMin = 0.65, ##GeV
+    pMin = 1.5, ##GeV
+    etaMin = -3.5,
+    etaMax = 3.5,
+    nHitMin = 7 ## at least 7 hits required
+)
+
+ALCARECOTkAlJetHT.GlobalSelector.applyIsolationtest = False
+ALCARECOTkAlJetHT.GlobalSelector.applyGlobalMuonFilter = False
+ALCARECOTkAlJetHT.TwoBodyDecaySelector.applyMassrangeFilter = False
+ALCARECOTkAlJetHT.TwoBodyDecaySelector.applyChargeFilter = False
+ALCARECOTkAlJetHT.TwoBodyDecaySelector.applyAcoplanarityFilter = False
+
+seqALCARECOTkAlJetHT = cms.Sequence(ALCARECOTkAlJetHTHLT+ALCARECOTkAlJetHTDCSFilter+ALCARECOTkAlJetHTPrescaler*ALCARECOTkAlJetHT)

Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml

@@ -9,7 +9,7 @@
 </library>
 <test name="test_PrepareInputDb" command="mps_prepare_input_db.py -g auto:run2_data -r 1 -o ${LOCALTOP}/tmp/test_input.db"/>
 <test name="test_MpsWorkFlow" command="test_mps-workflow.sh"/>
-<test name="test_CreateFileLists" command="mps_create_file_lists.py --test-mode --force -i /OVERRIDDEN/IN/TESTMODE -o ${LOCALTOP}/tmp/mps_create_file_lists -n 200000 --iov 42 --iov 174"/>
+<test name="test_CreateFileLists" command="tkal_create_file_lists.py --test-mode --force -i /OVERRIDDEN/IN/TESTMODE -o ${LOCALTOP}/tmp/mps_create_file_lists -n 200000 --iov 42 --iov 174"/>
 <test name="test-pede" command="pede -t">
   <use name="millepede"/>
   <flags USE_UNITTEST_DIR="1"/>

Alignment/MuonAlignment/test/muonGeometryDBConverter_cfg.py

@@ -37,7 +37,7 @@
 ################################################################################
 # parameters to configure:
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, "auto:phase1_2021_design")
+process.GlobalTag = GlobalTag(process.GlobalTag, "auto:phase1_2022_design")
 process.muonGeometryDBConverter.input = options.input
 process.muonGeometryDBConverter.output = options.output
 

Alignment/SurveyAnalysis/test/run-converter_cfg.py

@@ -3,7 +3,7 @@
 process = cms.Process("DATACONVERTER")
 
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
-process.GlobalTag.globaltag = 'auto:phase1_2021_realistic'
+process.GlobalTag.globaltag = 'auto:phase1_2022_realistic'
 
 process.load("Configuration.Geometry.GeometryDB_cff")
 process.load("Alignment.SurveyAnalysis.SurveyInfoScenario_cff")

CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapEcal.h

@@ -1,5 +1,5 @@
-#ifndef _CALO_MISCALIB_MAP_ECAL
-#define _CALO_MISCALIB_MAP_ECAL
+#ifndef CalibCalorimetry_CaloMiscalibTools_CaloMiscalibMapEcal_h
+#define CalibCalorimetry_CaloMiscalibTools_CaloMiscalibMapEcal_h
 #include "CondFormats/EcalObjects/interface/EcalIntercalibConstants.h"
 #include "CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMap.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
@@ -21,23 +21,17 @@ class CaloMiscalibMapEcal : public CaloMiscalibMap {
       if (iEta == 0)
         continue;
       for (int iPhi = EBDetId::MIN_IPHI; iPhi <= EBDetId::MAX_IPHI; ++iPhi) {
-        try {
-          EBDetId ebdetid(iEta, iPhi);
-          map_.setValue(ebdetid.rawId(), 1.0);
-        } catch (...) {
-        }
+        EBDetId ebdetid(iEta, iPhi);
+        map_.setValue(ebdetid.rawId(), 1.0);
       }
     }
 
     for (int iX = EEDetId::IX_MIN; iX <= EEDetId::IX_MAX; ++iX) {
       for (int iY = EEDetId::IY_MIN; iY <= EEDetId::IY_MAX; ++iY) {
-        try {
-          EEDetId eedetidpos(iX, iY, 1);
-          map_.setValue(eedetidpos.rawId(), 1.0);
-          EEDetId eedetidneg(iX, iY, -1);
-          map_.setValue(eedetidneg.rawId(), 1.0);
-        } catch (...) {
-        }
+        EEDetId eedetidpos(iX, iY, 1);
+        map_.setValue(eedetidpos.rawId(), 1.0);
+        EEDetId eedetidneg(iX, iY, -1);
+        map_.setValue(eedetidneg.rawId(), 1.0);
       }
     }
   }

CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLEcalEndcap.cc

@@ -9,18 +9,10 @@ DetId MiscalibReaderFromXMLEcalEndcap::parseCellEntry(XERCES_CPP_NAMESPACE::DOMN
 }
 
 EEDetId MiscalibReaderFromXMLEcalEndcap::getCellFromAttributes(int ix, int iy, int iz) {
-  try {
-    if (EEDetId::validDetId(ix, iy, iz)) {
-      EEDetId cell(ix, iy, iz);
-      return cell;
-    } else {
-      return EEDetId(0);
-    }
-  }
-
-  catch (...)
-
-  {
+  if (EEDetId::validDetId(ix, iy, iz)) {
+    EEDetId cell(ix, iy, iz);
+    return cell;
+  } else {
     std::cout << "Null coordinates = " << ix << "," << iy << "," << iz << std::endl;
     return EEDetId(0);
   }

CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNumbering.h

@@ -86,11 +86,11 @@ class TEcnaNumbering : public TObject {
 
   TEcnaNumbering();
   TEcnaNumbering(TEcnaObject*, const TString&);
-  TEcnaNumbering(const TString&, const TEcnaParEcal*);
+  TEcnaNumbering(const TString&, TEcnaParEcal*);
   ~TEcnaNumbering() override;
 
   void SetEcalSubDetector(const TString&);
-  void SetEcalSubDetector(const TString&, const TEcnaParEcal*);
+  void SetEcalSubDetector(const TString&, TEcnaParEcal*);
 
   //================================== BARREL
 

CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParHistos.h

@@ -79,12 +79,12 @@ class TEcnaParHistos : public TObject {
 
   TEcnaParHistos();
   TEcnaParHistos(TEcnaObject*, const TString&);
-  TEcnaParHistos(const TString&, const TEcnaParEcal*, const TEcnaNumbering*);
+  TEcnaParHistos(const TString&, TEcnaParEcal*, TEcnaNumbering*);
   ~TEcnaParHistos() override;
 
   void Init();
   void SetEcalSubDetector(const TString&);
-  void SetEcalSubDetector(const TString&, const TEcnaParEcal*, const TEcnaNumbering*);
+  void SetEcalSubDetector(const TString&, TEcnaParEcal*, TEcnaNumbering*);
 
   //...................................................... PLOT methods
   UInt_t SetCanvasWidth(const TString&, const TString&);

CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaWrite.h

@@ -145,13 +145,13 @@ class TEcnaWrite : public TObject {
 
   TEcnaWrite();
   TEcnaWrite(TEcnaObject*, const TString&);
-  TEcnaWrite(const TString&, const TEcnaParPaths*, const TEcnaParCout*, const TEcnaParEcal*, const TEcnaNumbering*);
+  TEcnaWrite(const TString&, TEcnaParPaths*, TEcnaParCout*, TEcnaParEcal*, TEcnaNumbering*);
 
   ~TEcnaWrite() override;
 
   void Init();
   void SetEcalSubDetector(const TString&);
-  void SetEcalSubDetector(const TString&, const TEcnaParEcal*, const TEcnaNumbering*);
+  void SetEcalSubDetector(const TString&, TEcnaParEcal*, TEcnaNumbering*);
 
   //...................................................... making file name method
   void fMakeResultsFileName();  // => default: arg = fCodeRoot