Merge pull request #5 from cms-sw/master

merge with master
knash · Aug 5, 2019 · 0b144d8 · 0b144d8
2 parents 5151b6c + 203bc98
commit 0b144d8
Show file tree

Hide file tree

Showing 106 changed files with 2,163 additions and 3,637 deletions.
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -24,16 +24,16 @@
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
     'run2_mc_pa'        :   '110X_mcRun2_pA_v2',
     # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   '110X_dataRun2_v2',
+    'run1_data'         :   '110X_dataRun2_2017_2018_Candidate_2019_08_03_03_51_45',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   '110X_dataRun2_v2',
+    'run2_data'         :   '110X_dataRun2_2017_2018_Candidate_2019_08_03_03_51_45',
     # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
-    'run2_data_relval'  :   '110X_dataRun2_relval_v2',
+    'run2_data_relval'  :   '110X_dataRun2_relval_Candidate_2019_08_03_03_55_32',
     # GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail
-    'run2_data_promptlike_HEfail' : '110X_dataRun2_PromptLike_HEfail_v1',
+    'run2_data_promptlike_HEfail' : '110X_dataRun2_PromptLike_HEfail_Candidate_2019_08_02_16_55_52',
     # GlobalTag for Run2 data 2016H relvals only: Prompt Conditions + fixed L1 menu (to be removed)
-    'run2_data_promptlike'    : '110X_dataRun2_PromptLike_v1',
-    'run2_data_promptlike_hi' : '110X_dataRun2_PromptLike_HI_v1',
+    'run2_data_promptlike'    : '110X_dataRun2_PromptLike_Candidate_2019_08_02_16_53_14',
+    'run2_data_promptlike_hi' : '110X_dataRun2_PromptLike_HI_Candidate_2019_08_02_16_55_18',
     # GlobalTag for Run1 HLT: it points to the online GT
     'run1_hlt'          :   '101X_dataRun2_HLT_frozen_v9',
     # GlobalTag for Run2 HLT: it points to the online GT
@@ -56,11 +56,11 @@
     # GlobalTag for MC production with perfectly aligned and calibrated detector for full Phase1 2018 (and 0,0,0-centred beamspot)
     'phase1_2018_design'       :  '110X_upgrade2018_design_v1',
     # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector
-    'phase1_2018_realistic'    :  '110X_upgrade2018_realistic_v1',
+    'phase1_2018_realistic'    :  '110X_upgrade2018_realistic_Candidate_2019_08_03_11_37_17',
     # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector for Heavy Ion
     'phase1_2018_realistic_hi' :  '110X_upgrade2018_realistic_HI_v2',
     # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector: HEM-15-16 fail
-    'phase1_2018_realistic_HEfail' :  '110X_upgrade2018_realistic_HEfail_v1',
+    'phase1_2018_realistic_HEfail' :  '110X_upgrade2018_realistic_HEfail_Candidate_2019_08_03_11_39_50',
     # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector,  Strip tracker in DECO mode
     'phase1_2018_cosmics'      :   '110X_upgrade2018cosmics_realistic_deco_v1',
     # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector,  Strip tracker in PEAK mode

diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py
@@ -74,7 +74,7 @@ def runSelected(opt):
                      10024.0, #2017 ttbar
                      10224.0, #2017 ttbar PU
                      10824.0, #2018 ttbar
-                     11624.0, #2021 ttbar
+                     11634.0, #2021 ttbar
                      20034.0, #2026D35 ttbar (MTD TDR baseline)
                      20434.0, #2026D41 ttbar (L1T TDR baseline)
                      21234.0, #2026D44 (exercise HF nose)

diff --git a/DetectorDescription/DDCMS/data/cms-tracker-2021.xml b/DetectorDescription/DDCMS/data/cms-tracker-2021.xml
@@ -42,11 +42,7 @@
 
   <IncludeSection>
     <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
-    <Include ref="DetectorDescription/DDCMS/data/trackermaterial.xml"/>
-    <Include ref="DetectorDescription/DDCMS/data/tibtidcommonmaterial.xml"/>
     <Include ref="DetectorDescription/DDCMS/data/vacuum.xml"/>
-    <Include ref="DetectorDescription/DDCMS/data/cmsextent.xml"/>
-    <Include ref="DetectorDescription/DDCMS/data/cms.xml"/>
     <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
     <Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
     <Include ref="Geometry/CMSCommonData/data/cms/2021/v1/cms.xml"/>

diff --git a/DetectorDescription/DDCMS/plugins/DDAngular.cc b/DetectorDescription/DDCMS/plugins/DDAngular.cc
@@ -1,5 +1,5 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <Math/Rotation3D.h>
@@ -9,8 +9,7 @@
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 using DD3Vector = ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> >;
 using DDAxisAngle = ROOT::Math::AxisAngle;

diff --git a/DetectorDescription/DDCMS/plugins/DDCutTubsFromPoints.cc b/DetectorDescription/DDCMS/plugins/DDCutTubsFromPoints.cc
@@ -2,9 +2,9 @@
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 
-using namespace geant_units::operators;  // _deg and convertRadToDeg
+using namespace cms_units::operators;  // _deg and convertRadToDeg
 
 static long algorithm(dd4hep::Detector& /* description */,
                       cms::DDParsingContext& ctxt,

diff --git a/DetectorDescription/DDCMS/plugins/DDHGCalCell.cc b/DetectorDescription/DDCMS/plugins/DDHGCalCell.cc
@@ -1,5 +1,4 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/DetectorDescription/DDCMS/plugins/DDHGCalWafer.cc b/DetectorDescription/DDCMS/plugins/DDHGCalWafer.cc
@@ -1,11 +1,11 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //#define EDM_ML_DEBUG
 
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(dd4hep::Detector& /* description */,
                       cms::DDParsingContext& ctxt,

diff --git a/DetectorDescription/DDCMS/plugins/DDHGCalWafer8.cc b/DetectorDescription/DDCMS/plugins/DDHGCalWafer8.cc
@@ -6,7 +6,6 @@
  */
 
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/DetectorDescription/DDCMS/plugins/DDLinear.cc b/DetectorDescription/DDCMS/plugins/DDLinear.cc
@@ -1,5 +1,5 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <Math/Cartesian3D.h>
@@ -8,7 +8,7 @@
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 using DD3Vector = ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> >;
 

diff --git a/DetectorDescription/DDCMS/plugins/DDPixBarLayerAlgo.cc b/DetectorDescription/DDCMS/plugins/DDPixBarLayerAlgo.cc
@@ -1,12 +1,12 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& description, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   PlacedVolume pv;

diff --git a/DetectorDescription/DDCMS/plugins/DDPixBarLayerUpgradeAlgo.cc b/DetectorDescription/DDCMS/plugins/DDPixBarLayerUpgradeAlgo.cc
@@ -1,9 +1,9 @@
 #include "DD4hep/DetFactoryHelper.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(dd4hep::Detector&, cms::DDParsingContext& ctxt, xml_h e, dd4hep::SensitiveDetector&) {
   cms::DDNamespace ns(ctxt, e, true);

diff --git a/DetectorDescription/DDCMS/plugins/DDPixFwdDiskAlgo.cc b/DetectorDescription/DDCMS/plugins/DDPixFwdDiskAlgo.cc
@@ -8,11 +8,11 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "DD4hep/Printout.h"
 
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 
 #include <sstream>
 
-using namespace geant_units::operators;  // _deg and convertRadToDeg
+using namespace cms_units::operators;  // _deg and convertRadToDeg
 
 static long algorithm(dd4hep::Detector& /* description */,
                       cms::DDParsingContext& ctxt,

diff --git a/DetectorDescription/DDCMS/plugins/DDPixPhase1FwdDiskAlgo.cc b/DetectorDescription/DDCMS/plugins/DDPixPhase1FwdDiskAlgo.cc
@@ -7,11 +7,11 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "DD4hep/Printout.h"
 
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 
 #include <sstream>
 
-using namespace geant_units::operators;  // _deg and convertRadToDeg
+using namespace cms_units::operators;  // _deg and convertRadToDeg
 
 static long algorithm(dd4hep::Detector& /* description */,
                       cms::DDParsingContext& ctxt,

diff --git a/DetectorDescription/DDCMS/plugins/DDTECCoolAlgo.cc b/DetectorDescription/DDCMS/plugins/DDTECCoolAlgo.cc
@@ -1,6 +1,6 @@
 #include "DD4hep/DetFactoryHelper.h"
 #include "DD4hep/Printout.h"
-#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/CMSUnits.h"
 #include "DetectorDescription/DDCMS/interface/DDPlugins.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -9,7 +9,7 @@
 using namespace std;
 using namespace dd4hep;
 using namespace cms;
-using namespace geant_units::operators;
+using namespace cms_units::operators;
 
 static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt, xml_h e, SensitiveDetector& /* sens */) {
   cms::DDNamespace ns(ctxt, e, true);