Merge branch 'master' into from-CMSSW_12_5_0_pre1_v2

trackreco · May 23, 2022 · c15c6b0 · c15c6b0
2 parents cf8231a + c521e81
commit c15c6b0
Show file tree

Hide file tree

Showing 357 changed files with 173,246 additions and 35,084 deletions.
diff --git a/Alignment/MillePedeAlignmentAlgorithm/python/MillePedeAlignmentAlgorithm_cfi.py b/Alignment/MillePedeAlignmentAlgorithm/python/MillePedeAlignmentAlgorithm_cfi.py
@@ -69,7 +69,7 @@
         # AlignmentProducer.ParameterBuilder.Selector, cf. Twiki page SWGuideMillepedeIIAlgorithm.
         Presigmas = cms.VPSet(),
         minHieraConstrCoeff = cms.double(1.e-10), # min abs value of coeff. in hierarchy constr.
-        minHieraParPerConstr = cms.uint32(2), # ignore hierarchy constraints with less params
+        minHieraParPerConstr = cms.uint32(1), # ignore hierarchy constraints with less params
         constrPrecision = cms.uint32(10), # precision for writing constraints to text file. Default is 6 and can be setup with constrPrecision = cms.uint32(0)
         # specify additional steering files
         additionalSteerFiles = cms.vstring(), # obsolete - can be given as entries in 'options'

diff --git a/Alignment/MillePedeAlignmentAlgorithm/python/mpsvalidate/subModule.py b/Alignment/MillePedeAlignmentAlgorithm/python/mpsvalidate/subModule.py
@@ -102,10 +102,10 @@ def plot(MillePedeUser, alignables, mode, struct, parentPlot, config):
 
                 # count entries which are not shown anymore
                 # bin 1 to begin of histogram
-                for j in range(1, numberOfBins / 2 - binShift):
+                for j in range(1, numberOfBins // 2 - binShift):
                     plot.hiddenEntries[i] += plot.histo[i].GetBinContent(j)
                 # from the end of shown bins to the end of histogram
-                for j in range(numberOfBins / 2 + binShift, plot.histo[i].GetNbinsX()):
+                for j in range(numberOfBins // 2 + binShift, plot.histo[i].GetNbinsX()):
                     plot.hiddenEntries[i] += plot.histo[i].GetBinContent(j)
 
                 # merge bins, ca. 100 should be visible in the resulting plot
@@ -128,8 +128,8 @@ def plot(MillePedeUser, alignables, mode, struct, parentPlot, config):
                     # set view range. it is important to note that the number of bins have changed with the rebinning
                     # the total number and the number of shift must be
                     # corrected with / mergeNumberBins
-                    plot.histo[i].GetXaxis().SetRange(int(numberOfBins / (2 * mergeNumberBins) - binShift /
-                                                          mergeNumberBins), int(numberOfBins / (2 * mergeNumberBins) + binShift / mergeNumberBins))
+                    plot.histo[i].GetXaxis().SetRange(int(numberOfBins // (2 * mergeNumberBins) - binShift /
+                                                          mergeNumberBins), int(numberOfBins // (2 * mergeNumberBins) + binShift / mergeNumberBins))
 
         # save copy
         plots[subStructNumber] = plot

diff --git a/Alignment/MillePedeAlignmentAlgorithm/scripts/mps_check.py b/Alignment/MillePedeAlignmentAlgorithm/scripts/mps_check.py
@@ -239,6 +239,7 @@
             #$mOutSize = `nsls -l $mssDir | grep $milleOut | head -1 | awk '{print \$5}'`;
             #$mOutSize = `cmsLs -l $mssDir | grep $milleOut | head -1 | awk '{print \$2}'`;
             mOutSize = 0
+            #print(">>>eoslsoutput:", eoslsoutput, " \ttype(eoslsoutput):", type(eoslsoutput))
             for line in eoslsoutput:
                 if milleOut in line:
                     columns = line.split()

diff --git a/Alignment/MillePedeAlignmentAlgorithm/scripts/mps_fire.py b/Alignment/MillePedeAlignmentAlgorithm/scripts/mps_fire.py
@@ -313,6 +313,7 @@ def write_HTCondor_submit_file_mille(path, script, lib, proxy_path=None):
                                                      shell=True).decode()
                 except subprocess.CalledProcessError as e:
                     result = "" # -> check for successful job submission will fail
+                #print('      '+result, end=' ')
                 print(result)
                 result = result.strip()
 

diff --git a/BigProducts/Simulation/BuildFile.xml b/BigProducts/Simulation/BuildFile.xml
@@ -24,7 +24,6 @@
 <use name="SimG4Core/SaveSimTrackAction"/>
 <use name="SimG4Core/SensitiveDetector"/>
 <use name="SimG4Core/TrackingVerbose"/>
-<use name="SimRomanPot/SimFP420"/>
 <use name="SimTracker/TrackerMaterialAnalysis"/>
 <use name="Validation/CheckOverlap"/>
 <use name="Validation/EcalHits"/>

diff --git a/CUDADataFormats/TrackingRecHit/BuildFile.xml b/CUDADataFormats/TrackingRecHit/BuildFile.xml
@@ -3,7 +3,7 @@
 <use name="CUDADataFormats/Common"/>
 <use name="CUDADataFormats/SiPixelCluster"/>
 <use name="DataFormats/Common"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="Geometry/CommonTopologies" source_only="1"/>
 <use name="HeterogeneousCore/CUDAUtilities"/>
 <export>
     <lib name="1"/>

diff --git a/CalibTracker/SiStripDCS/test/BuildFile.xml b/CalibTracker/SiStripDCS/test/BuildFile.xml
@@ -1,8 +1,6 @@
 <library file="Synchronization/*.cc" name="SyncCalibTrackerSiStripDCSPlugins">
   <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/ServiceRegistry"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CoralCommon"/>

diff --git a/CalibTracker/SiStripHitEfficiency/BuildFile.xml b/CalibTracker/SiStripHitEfficiency/BuildFile.xml
@@ -1,10 +1,5 @@
-<use name="CommonTools/UtilAlgos"/>
-<use name="DataFormats/DetId"/>
-<use name="DataFormats/Scalers"/>
 <use name="DataFormats/SiStripDetId"/>
-<use name="DataFormats/TrackingRecHit"/>
 <use name="Geometry/CommonDetUnit" source_only="1"/>
-<use name="RecoLocalTracker/SiStripClusterizer"/>
 <use name="RecoTracker/TransientTrackingRecHit"/>
 <use name="TrackingTools/TrackFitters"/>
 <export>

diff --git a/CalibTracker/SiStripQuality/plugins/BuildFile.xml b/CalibTracker/SiStripQuality/plugins/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="Geometry/Records"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="CalibFormats/SiStripObjects"/>
 <use name="CalibTracker/Records"/>

diff --git a/Calibration/EcalCalibAlgos/BuildFile.xml b/Calibration/EcalCalibAlgos/BuildFile.xml
@@ -18,7 +18,6 @@
 <use name="xerces-c"/>
 <use name="Calibration/Tools"/>
 <use name="CalibCalorimetry/CaloMiscalibTools"/>
-<use name="CondTools/Ecal"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="DQMServices/Core"/>
 <use name="CondCore/DBOutputService"/>

diff --git a/Calibration/EcalCalibAlgos/plugins/BuildFile.xml b/Calibration/EcalCalibAlgos/plugins/BuildFile.xml
@@ -1,19 +1,11 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/Utilities"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
-<use name="SimDataFormats/GeneratorProducts"/>
 <use name="DataFormats/EcalRecHit"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="CondFormats/EcalObjects"/>
 <use name="CondFormats/RunInfo"/>
 <use name="CondFormats/DataRecord"/>
 <use name="Geometry/CaloGeometry"/>
-<use name="Geometry/CaloTopology"/>
-<use name="Geometry/EcalAlgo"/>
-<use name="RecoEcal/EgammaCoreTools"/>
-<use name="RecoLocalCalo/EcalRecAlgos"/>
-<use name="CalibCalorimetry/CaloMiscalibTools"/>
 <use name="Calibration/Tools"/>
 <use name="PhysicsTools/NanoAOD"/>
 <use name="Calibration/EcalCalibAlgos"/>

diff --git a/CondFormats/Common/data/SiStripBadStripFromHitEffRcd_prep.json b/CondFormats/Common/data/SiStripBadStripFromHitEffRcd_prep.json
@@ -0,0 +1,9 @@
+{
+    "destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS", 
+    "destinationTags": {
+        "SiStripBadChannel_FromHitEfficiency_v0_prompt": {}
+    }, 
+    "inputTag": "SiStripBadStripRcdHitEff_pcl", 
+    "since": null, 
+    "userText": "T0 PCL Upload for SiStrip bad-channels from Hit Efficiency"
+}
diff --git a/CondFormats/Common/data/SiStripBadStripFromHitEffRcd_prod.json b/CondFormats/Common/data/SiStripBadStripFromHitEffRcd_prod.json
@@ -0,0 +1,9 @@
+{
+    "destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS", 
+    "destinationTags": {
+        "SiStripBadChannel_FromHitEfficiency_v0_prompt": {}
+    }, 
+    "inputTag": "SiStripBadStripRcdHitEff_pcl", 
+    "since": null, 
+    "userText": "T0 PCL Upload for SiStrip bad-channels from Hit Efficiency"
+}
diff --git a/CondFormats/Common/test/DropBoxMetadataReader.py b/CondFormats/Common/test/DropBoxMetadataReader.py
@@ -34,6 +34,7 @@
                                     'BeamSpotObjectsRcdHPByLumi',
                                     'BeamSpotObjectsRcdHPByRun',
                                     'SiStripBadStripRcd',
+                                    'SiStripBadStripFromHitEffRcd',
                                     'SiStripApvGainRcd',
                                     'TrackerAlignmentRcd',
                                     'SiStripApvGainRcdAfterAbortGap',
@@ -53,7 +54,7 @@
 process.p = cms.Path(process.myReader)
 
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
-process.GlobalTag.globaltag = '121X_dataRun3_Express_Queue'
+process.GlobalTag.globaltag = '124X_dataRun3_Express_Queue'
 
 # Set to True if you want to read a DropBoxMetadata payload from a local sqlite
 # specify the name of the sqlitefile.db and the tag name; the payload loaded will be for run 300000

diff --git a/CondFormats/Common/test/ProduceDropBoxMetadata.py b/CondFormats/Common/test/ProduceDropBoxMetadata.py
@@ -46,6 +46,10 @@ def encodeJsonInString(filename):
 SiStripBadStripRcd_prod_str = encodeJsonInString("SiStripBadStripRcd_prod.json")
 SiStripBadStripRcd_prep_str = encodeJsonInString("SiStripBadStripRcd_prep.json")
 
+#SiStripBadStripRcd from Hit Efficiency
+SiStripBadStripRcdHitEff_prod_str = encodeJsonInString("SiStripBadStripFromHitEffRcd_prod.json")
+SiStripBadStripRcdHitEff_prep_str = encodeJsonInString("SiStripBadStripFromHitEffRcd_prep.json")
+
 #SiStripApvGainRcd
 SiStripApvGainRcd_prod_str = encodeJsonInString("SiStripApvGainRcd_prod.json")
 SiStripApvGainRcd_multirun_prod_str = encodeJsonInString("SiStripApvGainRcd_multirun_prod.json") 
@@ -131,6 +135,12 @@ def encodeJsonInString(filename):
                                                                prodMetaData        = cms.untracked.string(SiStripBadStripRcd_prod_str),
                                                                prepMetaData        = cms.untracked.string(SiStripBadStripRcd_prep_str),
                                                                ),
+                                                      cms.PSet(record              = cms.untracked.string('SiStripBadStripFromHitEffRcd'),
+                                                               Source              = cms.untracked.string("AlcaHarvesting"),
+                                                               FileClass           = cms.untracked.string("ALCA"),
+                                                               prodMetaData        = cms.untracked.string(SiStripBadStripRcdHitEff_prod_str),
+                                                               prepMetaData        = cms.untracked.string(SiStripBadStripRcdHitEff_prep_str),
+                                                               ),
                                                       cms.PSet(record              = cms.untracked.string('SiStripApvGainRcd'),
                                                                Source              = cms.untracked.string("AlcaHarvesting"),
                                                                FileClass           = cms.untracked.string("ALCA"),
@@ -242,5 +252,4 @@ def encodeJsonInString(filename):
                                               )
 
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
-process.GlobalTag.globaltag = '121X_dataRun3_Express_Queue'
-
+process.GlobalTag.globaltag = '124X_dataRun3_Express_Queue'
diff --git a/CondFormats/SiStripObjects/test/BuildFile.xml b/CondFormats/SiStripObjects/test/BuildFile.xml
@@ -10,6 +10,5 @@
 </bin>
 
 <bin file="test_catch2_*.cpp" name="test_catch2_SiStripBadStrip_Phase2">
-  <use name="DataFormats/SiStripCommon"/>
   <use name="catch2"/>
 </bin>