Merge pull request #447 from cms-nanoAOD/branch_11_0_0_pre11

Update master to CMSSW_11_0_0_pre11
cms-patatrack · Oct 30, 2019 · 9e1351a · 9e1351a
2 parents 974479b + 5b0a828
commit 9e1351a
Show file tree

Hide file tree

Showing 1,145 changed files with 16,161 additions and 69,003 deletions.
diff --git a/Alignment/APEEstimation/BuildFile.xml b/Alignment/APEEstimation/BuildFile.xml
@@ -23,7 +23,6 @@
 <use name="TrackingTools/TrajectoryState"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/CommonTopologies"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondFormats/Alignment"/>
 <use name="RecoLocalTracker/SiStripClusterizer"/>
 <use name="RecoLocalTracker/SiStripRecHitConverter"/>

diff --git a/Alignment/APEEstimation/plugins/ApeEstimator.cc b/Alignment/APEEstimation/plugins/ApeEstimator.cc
@@ -72,7 +72,7 @@
 //added by Ajay 6Nov 2014
 //.......................
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
 

diff --git a/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml b/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml
@@ -91,7 +91,6 @@
   <use   name="DataFormats/CSCRecHit"/>
   <use   name="DataFormats/DTRecHit"/>
   <use   name="DataFormats/TrackingRecHit"/>
-  <use   name="Geometry/TrackerGeometryBuilder"/>
   <use   name="Geometry/DTGeometry"/>
   <use   name="Geometry/CSCGeometry"/>
   <use   name="Geometry/CommonDetUnit"/>
@@ -104,7 +103,6 @@
 
 <library   name="AlignmentStats" file="AlignmentStats.cc">
   <use   name="FWCore/Utilities"/>
-  <use   name="Geometry/TrackerGeometryBuilder"/>
   <use   name="Geometry/Records"/>
   <use   name="Alignment/CommonAlignment"/>
   <use   name="Alignment/TrackerAlignment"/>

diff --git a/Alignment/CommonAlignmentProducer/BuildFile.xml b/Alignment/CommonAlignmentProducer/BuildFile.xml
@@ -28,7 +28,6 @@
 <use   name="FWCore/ServiceRegistry"/>
 <use   name="DataFormats/Alignment"/>
 <use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
 <use   name="rootcore"/>
 <use   name="root"/>
 <export>

diff --git a/Alignment/MillePedeAlignmentAlgorithm/python/alignmentsetup/helper.py b/Alignment/MillePedeAlignmentAlgorithm/python/alignmentsetup/helper.py
@@ -11,7 +11,7 @@ def checked_out_MPS():
     git_initialized = False
     try:
         with open(checked_out_packages, "r") as f:
-            packages = ("/Alignment/", "/Alignment/MillePedeAlignmentAlgorithm/")
+            packages = ("/Alignment/", "/Alignment/MillePedeAlignmentAlgorithm/","/*/")
             for line in f:
                 if line.strip() in packages:
                     checked_out = True

diff --git a/Alignment/OfflineValidation/bin/DMRtrends.cc b/Alignment/OfflineValidation/bin/DMRtrends.cc
@@ -265,7 +265,7 @@ const map<TString, int> numberOfLayers(TString Year) {
  */
 
 TString lumifileperyear(TString Year, string RunOrIOV) {
-  TString LumiFile = getenv("CMSSW_BASE");
+  TString LumiFile = std::getenv("CMSSW_BASE");
   LumiFile += "/src/Alignment/OfflineValidation/data/lumiper";
   if (RunOrIOV != "run" && RunOrIOV != "IOV") {
     cout << "ERROR: Please specify \"run\" or \"IOV\" to retrieve the luminosity run by run or for each IOV" << endl;

diff --git a/Alignment/OfflineValidation/plugins/OverlapValidation.cc b/Alignment/OfflineValidation/plugins/OverlapValidation.cc
@@ -40,8 +40,8 @@
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParPaths.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParPaths.cc
@@ -320,7 +320,7 @@ void TEcnaParPaths::GetCMSSWParameters() {
 
   //------------ CMSSW_BASE
 
-  char *ch_cmssw_base = getenv("CMSSW_BASE");
+  char *ch_cmssw_base = std::getenv("CMSSW_BASE");
   if (ch_cmssw_base == nullptr) {
     std::cout << "*TEcnaParPaths::GetCMSSWParameters()> CMSSW_BASE not defined."
               << " Please, set up the environment (command: eval `scramv1 runtime -csh`)" << fTTBELL << std::endl;
@@ -330,7 +330,7 @@ void TEcnaParPaths::GetCMSSWParameters() {
 
   //------------ SCRAM_ARCH
 
-  char *ch_scram_arch = getenv("SCRAM_ARCH");
+  char *ch_scram_arch = std::getenv("SCRAM_ARCH");
   if (ch_scram_arch == nullptr) {
     std::cout << "*TEcnaParPaths::GetCMSSWParameters()> SCRAM_ARCH not defined."
               << " Please, set up the environment (command: eval `scramv1 runtime -csh`)" << fTTBELL << std::endl;

diff --git a/CalibCalorimetry/EcalLaserAnalyzer/src/ME.cc b/CalibCalorimetry/EcalLaserAnalyzer/src/ME.cc
@@ -63,22 +63,22 @@ std::vector<MEChannel*> ME::_trees = std::vector<MEChannel*>(4, (MEChannel*)null
 bool ME::useElectronicNumbering = false;
 
 TString ME::lmdataPath(int lmr) {
-  TString out_(getenv("MELMDAT"));
+  TString out_(std::getenv("MELMDAT"));
   out_ += "/";
   out_ += ME::smName(lmr);
   out_ += "/";
   return out_;
 }
 
 TString ME::primPath(int lmr) {
-  TString out_(getenv("MESTORE"));
+  TString out_(std::getenv("MESTORE"));
   out_ += "/";
   out_ += ME::smName(lmr);
   out_ += "/";
   return out_;
 }
 
-TString ME::path() { return TString(getenv("MUSECAL")) + "/"; }
+TString ME::path() { return TString(std::getenv("MUSECAL")) + "/"; }
 
 TString ME::rootFileName(ME::Header header, ME::Settings settings) {
   // get the laser monitoring region and super-module