[DO NOT MERGE - TEST ONLY] Remove #31730 and #32021 from #31907

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlCosmics0T_Output_cff.py

@@ -6,14 +6,17 @@
 OutALCARECOTkAlCosmics0T_noDrop = cms.PSet(
     SelectEvents = cms.untracked.PSet(
         SelectEvents = cms.vstring('pathALCARECOTkAlCosmicsCTF0T', 
-            'pathALCARECOTkAlCosmicsCosmicTF0T',
-            'pathALCARECOTkAlCosmicsRegional0T')
+                                   'pathALCARECOTkAlCosmicsCosmicTF0T',
+                                   'pathALCARECOTkAlCosmicsRegional0T',
+                                   'pathALCARECOTkAlCosmicsDuringCollisions0T'
+                                   )
     ),
     outputCommands = cms.untracked.vstring(
         #'keep *_ALCARECOTkAlCosmics*0T_*_*',
         'keep *_ALCARECOTkAlCosmicsCTF0T_*_*',
         'keep *_ALCARECOTkAlCosmicsCosmicTF0T_*_*',
         'keep *_ALCARECOTkAlCosmicsRegional0T_*_*',
+        'keep *_ALCARECOTkAlCosmicsDuringCollisions0T_*_*',
         'keep siStripDigis_DetIdCollection_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlCosmics0T_cff.py

@@ -46,7 +46,14 @@
     src = 'regionalCosmicTracks'
     )
 
+# AlCaReco for track based alignment using Cosmic muons reconstructed by Cosmics During Collisions Algorithm
+# (same cuts)
+ALCARECOTkAlCosmicsDuringCollisions0T = ALCARECOTkAlCosmicsCTF0T.clone(
+    src = 'cosmicDCTracks'
+    )
+
 #________________________________Sequences____________________________________
 seqALCARECOTkAlCosmicsCTF0T = cms.Sequence(ALCARECOTkAlCosmicsCTF0T)
 seqALCARECOTkAlCosmicsCosmicTF0T = cms.Sequence(ALCARECOTkAlCosmicsCosmicTF0T)
 seqALCARECOTkAlCosmicsRegional0T = cms.Sequence(ALCARECOTkAlCosmicsRegional0T)
+seqALCARECOTkAlCosmicsDuringCollisions0T = cms.Sequence(ALCARECOTkAlCosmicsDuringCollisions0T)

Alignment/MillePedeAlignmentAlgorithm/scripts/mps_fire.py

@@ -264,6 +264,15 @@ def write_HTCondor_submit_file_mille(path, script, lib, proxy_path=None):
         resources = '-q'+resources+' -m g_cmscaf'
     elif "htcondor" in resources:
         fire_htcondor = True
+        schedinfo = subprocess.check_output(["myschedd","show"])
+        if 'cafalca' in resources:
+            if not 'tzero' in schedinfo:
+                print("\nMPS fire: request to use CAF pool which has not been set up. Call `module load lxbatch/tzero` and try again")
+                exit(1)
+        else:
+            if not 'share' in schedinfo:
+                print("\nMPS fire: request to use standard pool when CAF pool is set up. Call `module load lxbatch/share` and try again")
+                exit(1)
     else:
         resources = '-q '+resources
 
@@ -322,6 +331,11 @@ def write_HTCondor_submit_file_mille(path, script, lib, proxy_path=None):
         resources = '-q cmscafalcamille'
     elif "htcondor" in resources:
         fire_htcondor = True
+        schedinfo = subprocess.check_output(["myschedd","show"])
+        if 'bigmem' in resources:
+            if not 'share' in schedinfo:
+                print("\nMPS fire: CAF pool is set up, but request to use high-memory machines which live in the standard pool. Call `module load lxbatch/share` and try again")
+                exit(1)
     else:
         resources = '-q '+resources
 

Alignment/OfflineValidation/python/TkAlAllInOneTool/helperFunctions.py

@@ -202,9 +202,12 @@ def getTagsMap(db):
     con = conddblib.connect(url = conddblib.make_url(db))
     session = con.session()
     TAG = session.get_dbtype(conddblib.Tag)
-    q1 = session.query(TAG.object_type).order_by(TAG.name).all()[0]
-    q2 = session.query(TAG.name).order_by(TAG.name).all()[0]
-    dictionary = dict(zip(q1, q2))
+    dictionary = {}
+    for i in range(0,len(session.query(TAG.object_type).order_by(TAG.name).all())):
+        q1 = session.query(TAG.object_type).order_by(TAG.name).all()[i][0]
+        q2 = session.query(TAG.name).order_by(TAG.name).all()[i][0]
+        dictionary[q1]=q2
+
     return dictionary
 
 def clean_name(s):

Alignment/OfflineValidation/scripts/validateAlignments.py

@@ -646,6 +646,13 @@ def main(argv = None):
 
     (options, args) = optParser.parse_args(argv)
 
+    if not options.dryRun:
+        schedinfo = subprocess.check_output(["myschedd","show"])
+        if not 'tzero' in schedinfo:
+            print("\nAll-In-One Tool: you need to call `module load lxbatch/tzero` before trying to submit jobs. Please do so and try again")
+            exit(1)
+
+
     if not options.restrictTo == None:
         options.restrictTo = options.restrictTo.split(",")
 

Alignment/OfflineValidation/test/test_all.sh

@@ -12,6 +12,7 @@ fi
 ## copy into local sqlite file the ideal alignment
 echo "COPYING locally Ideal Alignment ..."
 conddb --yes --db pro copy TrackerAlignment_Upgrade2017_design_v4 --destdb myfile.db
+conddb --yes --db pro copy TrackerAlignmentErrorsExtended_Upgrade2017_design_v0 --destdb myfile.db
 
 echo "GENERATING all-in-one tool configuration ..."
 cat <<EOF >> validation_config.ini
@@ -29,6 +30,7 @@ style = 2001
 title = express
 globaltag = 92X_dataRun2_Express_v2
 condition TrackerAlignmentRcd =  sqlite_file:myfile.db,TrackerAlignment_Upgrade2017_design_v4
+condition TrackerAlignmentErrorExtendedRcd = sqlite_file:myfile.db,TrackerAlignmentErrorsExtended_Upgrade2017_design_v0
 color = 2
 style = 2402
 

CalibCalorimetry/HcalAlgos/interface/HcalPulseShapes.h

@@ -106,8 +106,9 @@ class HcalPulseShapes {
   const HcalPulseShape& computeSiPMShapeHE206();
   void computeSiPMShapeData2017();
   void computeSiPMShapeData2018();
+  void computeSiPMShapeMCRecoRun3();
   Shape hpdShape_, hfShape_, siPMShapeHO_;
-  Shape siPMShapeData2017_, siPMShapeData2018_;
+  Shape siPMShapeData2017_, siPMShapeData2018_, siPMShapeMCRecoRun3_;
   Shape hpdShape_v2, hpdShapeMC_v2;
   Shape hpdShape_v3, hpdShapeMC_v3;
   Shape hpdBV30Shape_v2, hpdBV30ShapeMC_v2;

CalibCalorimetry/HcalAlgos/src/HcalPulseShapes.cc

@@ -27,6 +27,7 @@ Reco  MC
 202   202   =201,                                SiPMs Hamamatsu shape (HO)
 205   203   siPMShapeData2017_,siPMShapeMC2017_  SiPMs from Data, Hamamatsu shape (HE 2017)
 207   206   siPMShapeData2018_,siPMShapeMC2018_  SiPMs from Data, Hamamatsu shape (HE 2018)
+207   208   siPMShapeData2018_,siPMShapeMCRecoRun3_  SiPMs from Data, 2021 MC phase scan
 301   301   hfShape_                             regular HF PMT shape
 401   401                                        regular ZDC shape
 -------------------------------------------------------------------------------------------
@@ -124,13 +125,15 @@ Reco  MC
   computeSiPMShapeHO();
   computeSiPMShapeData2017();
   computeSiPMShapeData2018();
+  computeSiPMShapeMCRecoRun3();
 
   theShapes[201] = &siPMShapeHO_;
   theShapes[202] = theShapes[201];
   theShapes[203] = &(computeSiPMShapeHE203());
   theShapes[205] = &siPMShapeData2017_;
   theShapes[206] = &(computeSiPMShapeHE206());
   theShapes[207] = &siPMShapeData2018_;
+  theShapes[208] = &siPMShapeMCRecoRun3_;
   theShapes[301] = &hfShape_;
   //theShapes[401] = new CaloCachedShapeIntegrator(&theZDCShape);
 }
@@ -271,6 +274,56 @@ void HcalPulseShapes::computeHFShape() {
     hfShape_.setShapeBin(j, ntmp[j]);
   }
 }
+void HcalPulseShapes::computeSiPMShapeMCRecoRun3() {
+  //modified shape 206
+  //7.2 ns shift in 206
+  unsigned int nbin = 250;
+  std::array<float, 250> nt{
+      {0,           0,           0,           0,           0,           0,           0,           0.000117468,
+       0.0031549,   0.0117368,   0.0219974,   0.0305776,   0.0365429,   0.0400524,   0.0415915,   0.0416765,
+       0.0408111,   0.0394627,   0.0379353,   0.0363688,   0.0348152,   0.0332891,   0.0317923,   0.0303237,
+       0.028883,    0.0274714,   0.0260914,   0.0247462,   0.0234392,   0.0221738,   0.0209531,   0.0197793,
+       0.0186544,   0.0175796,   0.0165556,   0.0155823,   0.0146596,   0.0137866,   0.0129623,   0.0121853,
+       0.0114539,   0.0107665,   0.0101213,   0.0095162,   0.00894934,  0.00841873,  0.0079224,   0.00745841,
+       0.00702487,  0.00661995,  0.00624189,  0.00588898,  0.00555961,  0.00525223,  0.00496539,  0.0046977,
+       0.00444786,  0.00421464,  0.00399689,  0.00379353,  0.00360355,  0.00342602,  0.00326004,  0.0031048,
+       0.00295954,  0.00282355,  0.00269616,  0.00257676,  0.00246479,  0.00235972,  0.00226106,  0.00216834,
+       0.00208117,  0.00199914,  0.00192189,  0.0018491,   0.00178044,  0.00171565,  0.00165445,  0.00159659,
+       0.00154186,  0.00149003,  0.00144092,  0.00139435,  0.00135015,  0.00130816,  0.00126825,  0.00123027,
+       0.00119412,  0.00115966,  0.0011268,   0.00109544,  0.00106548,  0.00103685,  0.00100946,  0.000983242,
+       0.000958125, 0.000934047, 0.000910949, 0.000888775, 0.000867475, 0.000847,    0.000827306, 0.000808352,
+       0.000790097, 0.000772506, 0.000755545, 0.000739182, 0.000723387, 0.000708132, 0.00069339,  0.000679138,
+       0.000665352, 0.00065201,  0.000639091, 0.000626577, 0.00061445,  0.000602692, 0.000591287, 0.00058022,
+       0.000569477, 0.000559044, 0.000548908, 0.000539058, 0.000529481, 0.000520167, 0.000511106, 0.000502288,
+       0.000493704, 0.000485344, 0.000477201, 0.000469266, 0.000459912, 0.000448544, 0.000437961, 0.000428079,
+       0.000418825, 0.000410133, 0.000401945, 0.00039421,  0.000386883, 0.000379924, 0.000373298, 0.000366973,
+       0.000360922, 0.00035512,  0.000349545, 0.000344179, 0.000339003, 0.000334002, 0.000329163, 0.000324475,
+       0.000319925, 0.000315504, 0.000311204, 0.000307017, 0.000302935, 0.000298954, 0.000295066, 0.000291267,
+       0.000287553, 0.000283919, 0.000280361, 0.000276877, 0.000273462, 0.000270114, 0.000266831, 0.000263609,
+       0.000260447, 0.000257343, 0.000254295, 0.0002513,   0.000248358, 0.000245467, 0.000242625, 0.000239831,
+       0.000237083, 0.000234381, 0.000231723, 0.000229109, 0.000226536, 0.000224005, 0.000221514, 0.000219062,
+       0.000216648, 0.000214272, 0.000211933, 0.00020963,  0.000207362, 0.000205129, 0.000202929, 0.000200763,
+       0.000198629, 0.000196526, 0.000194455, 0.000192415, 0.000190405, 0.000188424, 0.000186472, 0.000184548,
+       0.000182653, 0.000180784, 0.000178943, 0.000177127, 0.000175338, 0.000173574, 0.000171835, 0.00017012,
+       0.000168429, 0.000166762, 0.000165119, 0.000163498, 0.000161899, 0.000160322, 0.000158767, 0.000157233,
+       0.000155721, 0.000154228, 0.000152756, 0.000151304, 0.000149871, 0.000148457, 0.000147062, 0.000145686,
+       0.000144327, 0.000142987, 0.000141664, 0.000140359, 0.000139071, 0.000137799, 0.000136544, 0.000135305,
+       0.000134082, 0.000132874, 0.000131682, 0.000130505, 0.000129344, 0.000128196, 0.000127064, 0.000125945,
+       0.00012484,  0.00012375,  0.000122672, 0.000121608, 0.000120558, 0.00011952,  0.000118495, 0.000117482,
+       0.000116482, 0.000115493}};
+
+  siPMShapeMCRecoRun3_.setNBin(nbin);
+
+  double norm = 0.;
+  for (unsigned int j = 0; j < nbin; ++j) {
+    norm += (nt[j] > 0) ? nt[j] : 0.;
+  }
+
+  for (unsigned int j = 0; j < nbin; ++j) {
+    nt[j] /= norm;
+    siPMShapeMCRecoRun3_.setShapeBin(j, nt[j]);
+  }
+}
 
 void HcalPulseShapes::computeSiPMShapeData2018() {
   //Combination of all phase scan data (May,Jul,Oct2017)

CommonTools/PileupAlgos/interface/PuppiAlgo.h

@@ -35,6 +35,8 @@ class PuppiAlgo {
   inline double rms() const { return cur_RMS; }
   inline double median() const { return cur_Med; }
 
+  inline double etaMaxExtrap() const { return fEtaMaxExtrap; }
+
 private:
   unsigned int fNAlgos;
   std::vector<double> fEtaMax;

CommonTools/PileupAlgos/interface/PuppiCandidate.h

@@ -1,29 +1,13 @@
-#ifndef CommonTools_PileupAlgos_PuppiCandidate
-#define CommonTools_PileupAlgos_PuppiCandidate
-
-#include "fastjet/PseudoJet.hh"
-
-// Extension of fastjet::PseudoJet that caches eta and some other info
-// Puppi uses register to decide between NHs, PV CHs, and PU CHs.
-class PuppiCandidate : public fastjet::PseudoJet {
-public:
-  using fastjet::PseudoJet::PseudoJet;
-  double pseudorapidity() const {
-    _ensure_valid_eta();
-    return _eta;
-  }
-  double eta() const { return pseudorapidity(); }
-  void _ensure_valid_eta() const {
-    if (_eta == fastjet::pseudojet_invalid_rap)
-      _eta = fastjet::PseudoJet::pseudorapidity();
-  }
-  void set_info(int puppi_register) { _puppi_register = puppi_register; }
-  inline int puppi_register() const { return _puppi_register; }
-
-private:
-  // variable names in fastjet style
-  mutable double _eta = fastjet::pseudojet_invalid_rap;
-  int _puppi_register;
+#ifndef CommonTools_PileupAlgos_PuppiCandidate_h
+#define CommonTools_PileupAlgos_PuppiCandidate_h
+
+struct PuppiCandidate {
+  double pt{0};
+  double eta{0};
+  double phi{0};
+  double m{0};
+  double rapidity{0};
+  int id{0};
 };
 
 #endif

CommonTools/PileupAlgos/interface/PuppiContainer.h

@@ -2,8 +2,8 @@
 #define COMMONTOOLS_PUPPI_PUPPICONTAINER_H_
 
 #include "CommonTools/PileupAlgos/interface/PuppiAlgo.h"
-#include "CommonTools/PileupAlgos/interface/RecoObj.h"
 #include "CommonTools/PileupAlgos/interface/PuppiCandidate.h"
+#include "CommonTools/PileupAlgos/interface/RecoObj.h"
 
 class PuppiContainer {
 public:
@@ -13,7 +13,6 @@ class PuppiContainer {
   void setNPV(int iNPV) { fNPV = iNPV; }
 
   std::vector<PuppiCandidate> const &pfParticles() const { return fPFParticles; }
-  std::vector<PuppiCandidate> const &pvParticles() const { return fChargedPV; }
   std::vector<double> const &puppiWeights();
   const std::vector<double> &puppiRawAlphas() { return fRawAlphas; }
   const std::vector<double> &puppiAlphas() { return fVals; }
@@ -43,7 +42,8 @@ class PuppiContainer {
   bool fPuppiDiagnostics;
   const std::vector<RecoObj> *fRecoParticles;
   std::vector<PuppiCandidate> fPFParticles;
-  std::vector<PuppiCandidate> fChargedPV;
+  std::vector<PuppiCandidate> fPFParticlesForVar;
+  std::vector<PuppiCandidate> fPFParticlesForVarChargedPV;
   std::vector<double> fWeights;
   std::vector<double> fVals;
   std::vector<double> fRawAlphas;
@@ -62,7 +62,6 @@ class PuppiContainer {
   double fPtMaxNeutralsStartSlope;
   int fNAlgos;
   int fNPV;
-  double fPVFrac;
   std::vector<PuppiAlgo> fPuppiAlgo;
 };
 #endif

CommonTools/PileupAlgos/plugins/PuppiProducer.cc

@@ -18,7 +18,6 @@
 #include "DataFormats/Common/interface/Association.h"
 //Main File
 #include "CommonTools/PileupAlgos/plugins/PuppiProducer.h"
-#include "CommonTools/PileupAlgos/interface/PuppiCandidate.h"
 
 // ------------------------------------------------------------------------------------------
 PuppiProducer::PuppiProducer(const edm::ParameterSet& iConfig) {
@@ -32,6 +31,8 @@ PuppiProducer::PuppiProducer(const edm::ParameterSet& iConfig) {
   fEtaMaxCharged = iConfig.getParameter<double>("EtaMaxCharged");
   fPtMaxPhotons = iConfig.getParameter<double>("PtMaxPhotons");
   fEtaMaxPhotons = iConfig.getParameter<double>("EtaMaxPhotons");
+  fNumOfPUVtxsForCharged = iConfig.getParameter<uint>("NumOfPUVtxsForCharged");
+  fDZCutForChargedFromPUVtxs = iConfig.getParameter<double>("DeltaZCutForChargedFromPUVtxs");
   fUseExistingWeights = iConfig.getParameter<bool>("useExistingWeights");
   fClonePackedCands = iConfig.getParameter<bool>("clonePackedCands");
   fVtxNdofCut = iConfig.getParameter<int>("vtxNdofCut");
@@ -97,15 +98,15 @@ void PuppiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
       const reco::Vertex* closestVtx = nullptr;
       double pDZ = -9999;
       double pD0 = -9999;
-      int pVtxId = -9999;
-      bool lFirst = true;
+      uint pVtxId = 0;
       bool isLepton = ((std::abs(pReco.pdgId) == 11) || (std::abs(pReco.pdgId) == 13));
       const pat::PackedCandidate* lPack = dynamic_cast<const pat::PackedCandidate*>(&aPF);
       if (lPack == nullptr) {
         const reco::PFCandidate* pPF = dynamic_cast<const reco::PFCandidate*>(&aPF);
         double curdz = 9999;
         int closestVtxForUnassociateds = -9999;
         const reco::TrackRef aTrackRef = pPF->trackRef();
+        bool lFirst = true;
         for (auto const& aV : *pvCol) {
           if (lFirst) {
             if (aTrackRef.isNonnull()) {
@@ -157,10 +158,12 @@ void PuppiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
             pReco.id = 3;
           else if (tmpFromPV == 0) {
             pReco.id = 2;
-          }  // 0 is associated to PU vertex
-          else if (tmpFromPV == 3) {
+            if (fNumOfPUVtxsForCharged > 0 and (pVtxId <= fNumOfPUVtxsForCharged) and
+                (std::abs(pDZ) < fDZCutForChargedFromPUVtxs))
+              pReco.id = 1;
+          } else if (tmpFromPV == 3)
             pReco.id = 1;
-          } else if (tmpFromPV == 1 || tmpFromPV == 2) {
+          else if (tmpFromPV == 1 || tmpFromPV == 2) {
             pReco.id = 0;
             if ((fPtMaxCharged > 0) and (pReco.pt > fPtMaxCharged))
               pReco.id = 1;
@@ -185,12 +188,20 @@ void PuppiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
           pReco.id = 0;
         }
         if (std::abs(pReco.charge) > 0) {
-          if (fPuppiNoLep && isLepton)
+          if (fPuppiNoLep && isLepton) {
             pReco.id = 3;
-          else if (lPack->fromPV() == 0) {
+          } else if (lPack->fromPV() == 0) {
             pReco.id = 2;
-          }  // 0 is associated to PU vertex
-          else if (lPack->fromPV() == (pat::PackedCandidate::PVUsedInFit)) {
+            if ((fNumOfPUVtxsForCharged > 0) and (std::abs(pDZ) < fDZCutForChargedFromPUVtxs)) {
+              for (size_t puVtx_idx = 1; puVtx_idx <= fNumOfPUVtxsForCharged && puVtx_idx < pvCol->size();
+                   ++puVtx_idx) {
+                if (lPack->fromPV(puVtx_idx) >= 2) {
+                  pReco.id = 1;
+                  break;
+                }
+              }
+            }
+          } else if (lPack->fromPV() == (pat::PackedCandidate::PVUsedInFit)) {
             pReco.id = 1;
           } else if (lPack->fromPV() == (pat::PackedCandidate::PVTight) ||
                      lPack->fromPV() == (pat::PackedCandidate::PVLoose)) {
@@ -373,6 +384,8 @@ void PuppiProducer::fillDescriptions(edm::ConfigurationDescriptions& description
   desc.add<double>("EtaMaxPhotons", 2.5);
   desc.add<double>("PtMaxNeutrals", 200.);
   desc.add<double>("PtMaxNeutralsStartSlope", 0.);
+  desc.add<uint>("NumOfPUVtxsForCharged", 0);
+  desc.add<double>("DeltaZCutForChargedFromPUVtxs", 0.2);
   desc.add<bool>("useExistingWeights", false);
   desc.add<bool>("clonePackedCands", false);
   desc.add<int>("vtxNdofCut", 4);

CommonTools/PileupAlgos/plugins/PuppiProducer.h

@@ -68,6 +68,8 @@ class PuppiProducer : public edm::stream::EDProducer<> {
   double fEtaMaxCharged;
   double fPtMaxPhotons;
   double fEtaMaxPhotons;
+  uint fNumOfPUVtxsForCharged;
+  double fDZCutForChargedFromPUVtxs;
   bool fUseExistingWeights;
   bool fClonePackedCands;
   int fVtxNdofCut;

CommonTools/PileupAlgos/python/Puppi_cff.py

@@ -31,6 +31,8 @@
                        UseDeltaZCut   = cms.bool(True),
                        EtaMinUseDeltaZ = cms.double(2.4),
                        DeltaZCut      = cms.double(0.3),
+                       NumOfPUVtxsForCharged = cms.uint32(0),
+                       DeltaZCutForChargedFromPUVtxs = cms.double(0.2),
 		       PtMaxCharged   = cms.double(20.),
 		       EtaMaxCharged   = cms.double(99999.),
 		       PtMaxPhotons = cms.double(-1.),