Merge branch 'master' into dd4hep-ecal-cell-test-fix

cms-sw · Mar 15, 2021 · 9aeb7c4 · 9aeb7c4
2 parents 2e15cc5 + 0631646
commit 9aeb7c4
Show file tree

Hide file tree

Showing 116 changed files with 1,059 additions and 334 deletions.
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -2,13 +2,13 @@
 
     ### NEW KEYS ###
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Run1
-    'run1_design'       :   '113X_mcRun1_design_v1',
+    'run1_design'       :   '113X_mcRun1_design_v2',
     # GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
-    'run1_mc'           :   '113X_mcRun1_realistic_v1',
+    'run1_mc'           :   '113X_mcRun1_realistic_v2',
     # GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
-    'run1_mc_hi'        :   '113X_mcRun1_HeavyIon_v1',
+    'run1_mc_hi'        :   '113X_mcRun1_HeavyIon_v2',
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
-    'run1_mc_pa'        :   '113X_mcRun1_pA_v1',
+    'run1_mc_pa'        :   '113X_mcRun1_pA_v2',
     # GlobalTag for MC production with pessimistic alignment and calibrations for Run2
     'run2_mc_50ns'      :   '113X_mcRun2_startup_v2',
     # GlobalTag for MC production (2015 L1 Trigger Stage1) with startup-like alignment and calibrations for Run2, L1 trigger in Stage1 mode
@@ -40,14 +40,14 @@
     # GlobalTag for Run2 HLT: it points to the online GT
     'run2_hlt'          :   '101X_dataRun2_HLT_frozen_v11',
     # GlobalTag for Run2 HLT RelVals: customizations to run with fixed L1 Menu
-    'run2_hlt_relval'      :   '112X_dataRun2_HLT_relval_v3',
-    'run2_hlt_relval_hi'   :   '112X_dataRun2_HLT_relval_HI_v2',
+    'run2_hlt_relval'      :   '112X_dataRun2_HLT_relval_v4',
+    'run2_hlt_relval_hi'   :   '112X_dataRun2_HLT_relval_HI_v3',
     # GlobalTag for Run2 HLT for HI (not 2018 HI): it points to the online GT
     'run2_hlt_hi'       :   '101X_dataRun2_HLTHI_frozen_v11',
     # GlobalTag for Run3 data relvals (express GT)
-    'run3_data_express'        :   '112X_dataRun3_Express_v2',
+    'run3_data_express'        :   '112X_dataRun3_Express_v3',
     # GlobalTag for Run3 data relvals
-    'run3_data_promptlike'     :   '112X_dataRun3_Prompt_v2',
+    'run3_data_promptlike'     :   '112X_dataRun3_Prompt_v3',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot)
     'phase1_2017_design'       :  '113X_mc2017_design_v4',
     # GlobalTag for MC production with realistic conditions for Phase1 2017 detector
@@ -83,7 +83,7 @@
     # GlobalTag for MC production with realistic conditions for Phase1 2024
     'phase1_2024_realistic'    : '113X_mcRun3_2024_realistic_v5', # GT containing realistic conditions for Phase1 2024
     # GlobalTag for MC production with realistic conditions for Phase2
-    'phase2_realistic'         : '113X_mcRun4_realistic_v5'
+    'phase2_realistic'         : '113X_mcRun4_realistic_v6'
 }
 
 aliases = {

diff --git a/DQM/DataScouting/BuildFile.xml b/DQM/DataScouting/BuildFile.xml
@@ -4,6 +4,7 @@
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/Math"/>
 <use name="DQMServices/Core"/>
+<use name="DataFormats/JetReco"/>
 <export>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>

diff --git a/DQM/SiTrackerPhase2/plugins/Phase2ITMonitorCluster.cc b/DQM/SiTrackerPhase2/plugins/Phase2ITMonitorCluster.cc
@@ -261,8 +261,8 @@ void Phase2ITMonitorCluster::fillDescriptions(edm::ConfigurationDescriptions& de
     psd0.add<std::string>("title", "NumberClusters;Number of Clusters;");
     psd0.add<double>("xmin", 0.0);
     psd0.add<bool>("switch", true);
-    psd0.add<double>("xmax", 0.0);
-    psd0.add<int>("NxBins", 50);
+    psd0.add<double>("xmax", 300000.0);
+    psd0.add<int>("NxBins", 150);
     desc.add<edm::ParameterSetDescription>("GlobalNClusters", psd0);
   }
   {
@@ -325,8 +325,8 @@ void Phase2ITMonitorCluster::fillDescriptions(edm::ConfigurationDescriptions& de
     psd0.add<std::string>("title", "NumberOfClutsers;Number of Clusters;");
     psd0.add<double>("xmin", 0.0);
     psd0.add<bool>("switch", true);
-    psd0.add<double>("xmax", 0.0);
-    psd0.add<int>("NxBins", 50);
+    psd0.add<double>("xmax", 20000.0);
+    psd0.add<int>("NxBins", 150);
     desc.add<edm::ParameterSetDescription>("NClustersLayer", psd0);
   }
   {

diff --git a/DQM/SiTrackerPhase2/plugins/Phase2ITMonitorRecHit.cc b/DQM/SiTrackerPhase2/plugins/Phase2ITMonitorRecHit.cc
@@ -270,8 +270,8 @@ void Phase2ITMonitorRecHit::fillDescriptions(edm::ConfigurationDescriptions& des
     psd0.add<std::string>("title", "NumberRecHits;Number of RecHits;");
     psd0.add<double>("xmin", 0.0);
     psd0.add<bool>("switch", true);
-    psd0.add<double>("xmax", 0.0);
-    psd0.add<int>("NxBins", 50);
+    psd0.add<double>("xmax", 250000.0);
+    psd0.add<int>("NxBins", 250);
     desc.add<edm::ParameterSetDescription>("GlobalNumberRecHits", psd0);
   }
   {
@@ -333,8 +333,8 @@ void Phase2ITMonitorRecHit::fillDescriptions(edm::ConfigurationDescriptions& des
     psd0.add<std::string>("title", "NumberRecHits;Number of RecHits;");
     psd0.add<double>("xmin", 0.0);
     psd0.add<bool>("switch", true);
-    psd0.add<double>("xmax", 0.0);
-    psd0.add<int>("NxBins", 50);
+    psd0.add<double>("xmax", 150000.0);
+    psd0.add<int>("NxBins", 150);
     desc.add<edm::ParameterSetDescription>("LocalNumberRecHits", psd0);
   }
   {
@@ -392,8 +392,8 @@ void Phase2ITMonitorRecHit::fillDescriptions(edm::ConfigurationDescriptions& des
     psd0.add<std::string>("title", "Cluster_SizeY;cluster size y;");
     psd0.add<double>("xmin", -0.5);
     psd0.add<bool>("switch", true);
-    psd0.add<double>("xmax", 20.5);
-    psd0.add<int>("NxBins", 21);
+    psd0.add<double>("xmax", 25.5);
+    psd0.add<int>("NxBins", 26);
     desc.add<edm::ParameterSetDescription>("LocalClusterSizeY", psd0);
   }
   {
@@ -419,7 +419,7 @@ void Phase2ITMonitorRecHit::fillDescriptions(edm::ConfigurationDescriptions& des
   {
     edm::ParameterSetDescription psd0;
     psd0.add<std::string>("name", "RecHit_X_error_Vs_eta");
-    psd0.add<std::string>("title", "RecHit_X_error_Vs_eta;#eta;x error #times 10^{6}");
+    psd0.add<std::string>("title", "RecHit_X_error_Vs_eta;#eta;x error [#mum]");
     psd0.add<bool>("switch", true);
     psd0.add<int>("NxBins", 82);
     psd0.add<double>("xmax", 4.1);
@@ -431,7 +431,7 @@ void Phase2ITMonitorRecHit::fillDescriptions(edm::ConfigurationDescriptions& des
   {
     edm::ParameterSetDescription psd0;
     psd0.add<std::string>("name", "RecHit_Y_error_Vs_eta");
-    psd0.add<std::string>("title", "RecHit_Y_error_Vs_eta;#eta;y error #times 10^{6}");
+    psd0.add<std::string>("title", "RecHit_Y_error_Vs_eta;#eta;y error [#mum]");
     psd0.add<bool>("switch", true);
     psd0.add<int>("NxBins", 82);
     psd0.add<double>("xmax", 4.1);

diff --git a/DQM/SiTrackerPhase2/plugins/Phase2OTMonitorCluster.cc b/DQM/SiTrackerPhase2/plugins/Phase2OTMonitorCluster.cc
@@ -275,8 +275,8 @@ void Phase2OTMonitorCluster::fillDescriptions(edm::ConfigurationDescriptions& de
     psd0.add<std::string>("title", ";Number of clusters per event;");
     psd0.add<double>("xmin", 0.0);
     psd0.add<bool>("switch", true);
-    psd0.add<double>("xmax", 0.0);
-    psd0.add<int>("NxBins", 50);
+    psd0.add<double>("xmax", 350000.0);
+    psd0.add<int>("NxBins", 150);
     desc.add<edm::ParameterSetDescription>("GlobalNClusters", psd0);
   }
   {
@@ -338,8 +338,8 @@ void Phase2OTMonitorCluster::fillDescriptions(edm::ConfigurationDescriptions& de
     psd0.add<std::string>("name", "NumberOfClustersLayerP");
     psd0.add<std::string>("title", ";Number of clusters per event(macro pixel sensor);");
     psd0.add<double>("xmin", 0.0);
-    psd0.add<double>("xmax", 0.0);
-    psd0.add<int>("NxBins", 50);
+    psd0.add<double>("xmax", 28000.0);
+    psd0.add<int>("NxBins", 150);
     psd0.add<bool>("switch", true);
     desc.add<edm::ParameterSetDescription>("NClustersLayer_P", psd0);
   }
@@ -348,8 +348,8 @@ void Phase2OTMonitorCluster::fillDescriptions(edm::ConfigurationDescriptions& de
     psd0.add<std::string>("name", "NumberOfClustersLayerS");
     psd0.add<std::string>("title", ";Number of clusters per event(strip sensor);");
     psd0.add<double>("xmin", 0.0);
-    psd0.add<double>("xmax", 0.0);
-    psd0.add<int>("NxBins", 50);
+    psd0.add<double>("xmax", 28000.0);
+    psd0.add<int>("NxBins", 150);
     psd0.add<bool>("switch", true);
     desc.add<edm::ParameterSetDescription>("NClustersLayer_S", psd0);
   }

diff --git a/DataFormats/Alignment/BuildFile.xml b/DataFormats/Alignment/BuildFile.xml
@@ -2,6 +2,9 @@
 <use name="DataFormats/TrackingRecHit"/>
 <use name="DataFormats/SiStripDetId"/>
 <use name="FWCore/Utilities"/>
+<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/GeometrySurface"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/BTauReco/BuildFile.xml b/DataFormats/BTauReco/BuildFile.xml
@@ -5,6 +5,10 @@
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/VertexReco"/>
 <use name="FWCore/Utilities"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="DataFormats/GeometryVector"/>
 <use name="boost"/>
 <use name="clhep"/>
 <use name="rootmath"/>

diff --git a/DataFormats/BeamSpot/BuildFile.xml b/DataFormats/BeamSpot/BuildFile.xml
@@ -1,5 +1,7 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/CLHEP"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/Math"/>
 <use name="rootcore"/>
 <use name="rootsmatrix"/>
 <use name="clhep"/>

diff --git a/DataFormats/CSCDigi/BuildFile.xml b/DataFormats/CSCDigi/BuildFile.xml
@@ -1,6 +1,8 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/MuonDetId"/>
 <use name="DataFormats/GEMDigi"/>
+<use name="DataFormats/MuonData"/>
+<use name="FWCore/MessageLogger"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/CTPPSDetId/BuildFile.xml b/DataFormats/CTPPSDetId/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="DataFormats/DetId"/>
+<use name="FWCore/Utilities"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/CTPPSDigi/BuildFile.xml b/DataFormats/CTPPSDigi/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="DataFormats/Common"/>
+<use name="FWCore/Utilities"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/CTPPSReco/BuildFile.xml b/DataFormats/CTPPSReco/BuildFile.xml
@@ -2,6 +2,8 @@
 <use name="DataFormats/CTPPSDigi"/>
 <use name="DataFormats/GeometrySurface"/>
 <use name="DataFormats/Math"/>
+<use name="DataFormats/CTPPSDetId"/>
+<use name="DataFormats/GeometryVector"/>
 <use name="rootsmatrix"/>
 <use name="rootmath"/>
 <use name="rootphysics"/>

diff --git a/DataFormats/CaloRecHit/BuildFile.xml b/DataFormats/CaloRecHit/BuildFile.xml
@@ -1,6 +1,7 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Math"/>
 <use name="DataFormats/DetId"/>
+<use name="FWCore/Utilities"/>
 <use name="rootmath"/>
 <use name="eigen"/>
 <export>

diff --git a/DataFormats/CastorReco/BuildFile.xml b/DataFormats/CastorReco/BuildFile.xml
@@ -1,6 +1,7 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Candidate"/>
 <use name="DataFormats/HcalRecHit"/>
+<use name="DataFormats/Math"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/EcalDigi/BuildFile.xml b/DataFormats/EcalDigi/BuildFile.xml
@@ -1,5 +1,8 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/DetId"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/EcalRecHit/BuildFile.xml b/DataFormats/EcalRecHit/BuildFile.xml
@@ -2,6 +2,8 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/DetId"/>
+<use name="FWCore/MessageLogger"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/EgammaCandidates/BuildFile.xml b/DataFormats/EgammaCandidates/BuildFile.xml
@@ -13,6 +13,7 @@
 <use name="DataFormats/GsfTrackReco"/>
 <use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="FWCore/MessageLogger"/>
+<use name="DataFormats/GeometryVector"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/EgammaReco/BuildFile.xml b/DataFormats/EgammaReco/BuildFile.xml
@@ -5,6 +5,9 @@
 <use name="DataFormats/TrackingRecHit"/>
 <use name="DataFormats/TrajectorySeed"/>
 <use name="DataFormats/TrackReco"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/TrajectoryState"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/EgammaTrackReco/BuildFile.xml b/DataFormats/EgammaTrackReco/BuildFile.xml
@@ -4,6 +4,7 @@
 <use name="DataFormats/CaloRecHit"/>
 <use name="DataFormats/TrackCandidate"/>
 <use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/CLHEP"/>
 <use name="clhepheader"/>
 <export>
   <lib name="1"/>

diff --git a/DataFormats/FP420Cluster/BuildFile.xml b/DataFormats/FP420Cluster/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="DataFormats/Common"/>
+<use name="DataFormats/FP420Digi"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/FTLDigi/BuildFile.xml b/DataFormats/FTLDigi/BuildFile.xml
@@ -1,5 +1,6 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/ForwardDetId"/>
+<use name="DataFormats/DetId"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/GEMDigi/BuildFile.xml b/DataFormats/GEMDigi/BuildFile.xml
@@ -1,6 +1,8 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/MuonDetId"/>
 <use name="DataFormats/GEMRecHit"/>
+<use name="DataFormats/MuonData"/>
+<use name="FWCore/MessageLogger"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/GEMRecHit/BuildFile.xml b/DataFormats/GEMRecHit/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="DataFormats/MuonDetId"/>
 <use name="DataFormats/TrackingRecHit"/>
 <use name="DataFormats/CSCRecHit"/>
+<use name="FWCore/MessageLogger"/>
 <use name="rootrflx"/>
 <export>
   <lib name="1"/>

diff --git a/DataFormats/GeometrySurface/BuildFile.xml b/DataFormats/GeometrySurface/BuildFile.xml
@@ -1,4 +1,6 @@
 <use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/Math"/>
+<use name="FWCore/Utilities"/>
 <use name="boost"/>
 <export>
   <lib name="1"/>

diff --git a/DataFormats/GsfTrackReco/BuildFile.xml b/DataFormats/GsfTrackReco/BuildFile.xml
@@ -1,5 +1,8 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/TrackReco"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="DataFormats/Math"/>
+<use name="FWCore/Utilities"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/HGCDigi/BuildFile.xml b/DataFormats/HGCDigi/BuildFile.xml
@@ -1,6 +1,7 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/ForwardDetId"/>
 <use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/DetId"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/HGCRecHit/BuildFile.xml b/DataFormats/HGCRecHit/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/ForwardDetId"/>
 <use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/DetId"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/HGCalReco/BuildFile.xml b/DataFormats/HGCalReco/BuildFile.xml
@@ -3,6 +3,7 @@
 <use name="DataFormats/Candidate"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/TrackReco"/>
+<use name="DataFormats/GeometryVector"/>
 <use name="eigen"/>
 <export>
   <lib name="1"/>

diff --git a/DataFormats/HLTReco/BuildFile.xml b/DataFormats/HLTReco/BuildFile.xml
@@ -12,6 +12,7 @@
 <use name="DataFormats/L1TParticleFlow"/>
 <use name="DataFormats/L1TCorrelator"/>
 <use name="FWCore/MessageLogger"/>
+<use name="DataFormats/GsfTrackReco"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/HcalCalibObjects/BuildFile.xml b/DataFormats/HcalCalibObjects/BuildFile.xml
@@ -1,5 +1,6 @@
 <use name="DataFormats/Common"/>
 <use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/HcalDetId/BuildFile.xml b/DataFormats/HcalDetId/BuildFile.xml
@@ -1,5 +1,6 @@
 <use name="DataFormats/DetId"/>
 <use name="FWCore/Utilities"/>
+<use name="FWCore/MessageLogger"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/HcalDigi/BuildFile.xml b/DataFormats/HcalDigi/BuildFile.xml
@@ -1,5 +1,6 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/DetId"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/Histograms/BuildFile.xml b/DataFormats/Histograms/BuildFile.xml
@@ -1,5 +1,7 @@
 <use name="roothistmatrix"/>
 <use name="DataFormats/Common"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Utilities"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/JetReco/BuildFile.xml b/DataFormats/JetReco/BuildFile.xml
@@ -6,6 +6,10 @@
 <use name="DataFormats/ParticleFlowReco"/>
 <use name="DataFormats/TrackReco"/>
 <use name="FWCore/Utilities"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/VertexReco"/>
+<use name="FWCore/MessageLogger"/>
 <flags LCG_DICT_HEADER="classes_1.h classes_2.h classes_3.h classes_4.h"/>
 <flags LCG_DICT_XML="classes_def_1.xml classes_def_2.xml classes_def_3.xml classes_def_4.xml"/>
 <export>