Merge branch 'cms-sw:master' into hostname_correct

Alignment/CommonAlignment/test/BuildFile.xml

@@ -1,3 +1,4 @@
 <bin file="test_AlignableObjectId.cc">
   <use name="Alignment/CommonAlignment"/>
 </bin>
+<test name="test_CreateFileLists" command="tkal_create_file_lists.py --test-mode --force -i /OVERRIDDEN/IN/TESTMODE -o ${LOCALTOP}/tmp/mps_create_file_lists -n 200000 --iov 42 --iov 174"/>

Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h

@@ -250,6 +250,7 @@ class AlignmentProducerBase {
   const bool saveToDB_, saveApeToDB_, saveDeformationsToDB_;
   const bool useSurvey_;
   const bool enableAlignableUpdates_;
+  const std::string tkAliRcdName_;
 
   /*** ESTokens ***/
   const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> ttopoToken_;

Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHG_Output_cff.py

@@ -0,0 +1,12 @@
+import FWCore.ParameterSet.Config as cms
+
+OutALCARECOPromptCalibProdSiPixelAliHG_noDrop = cms.PSet(
+    SelectEvents = cms.untracked.PSet(
+        SelectEvents = cms.vstring('pathALCARECOPromptCalibProdSiPixelAliHG')
+    ),
+    outputCommands = cms.untracked.vstring(
+        'keep *_SiPixelAliMillePedeFileConverterHG_*_*')
+)
+
+OutALCARECOPromptCalibProdSiPixelAliHG=OutALCARECOPromptCalibProdSiPixelAliHG_noDrop.clone()
+OutALCARECOPromptCalibProdSiPixelAliHG.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAliHG_cff.py

@@ -0,0 +1,79 @@
+import FWCore.ParameterSet.Config as cms
+
+# ------------------------------------------------------------------------------
+# configure a filter to run only on the events selected by TkAlMinBias AlcaReco
+from Alignment.CommonAlignmentProducer.ALCARECOPromptCalibProdSiPixelAli_cff import *
+ALCARECOTkAlMinBiasFilterForSiPixelAliHG = ALCARECOTkAlMinBiasFilterForSiPixelAli.clone()
+
+
+from Alignment.CommonAlignmentProducer.LSNumberFilter_cfi import *
+
+# Ingredient: offlineBeamSpot
+from RecoVertex.BeamSpotProducer.BeamSpot_cfi import offlineBeamSpot
+
+# Ingredient: AlignmentTrackSelector
+# track selector for HighPurity tracks
+#-- AlignmentTrackSelector
+SiPixelAliHighPuritySelectorHG = SiPixelAliHighPuritySelector.clone()
+
+# track selection for alignment
+SiPixelAliTrackSelectorHG = SiPixelAliTrackSelector.clone(
+	src = 'SiPixelAliTrackFitterHG'
+)
+
+# Ingredient: SiPixelAliTrackRefitter0
+# refitting
+SiPixelAliTrackRefitterHG0 = SiPixelAliTrackRefitter0.clone(
+	src = 'SiPixelAliHighPuritySelectorHG'
+)
+SiPixelAliTrackRefitterHG1 = SiPixelAliTrackRefitterHG0.clone(
+	src = 'SiPixelAliTrackSelectorHG'
+)
+
+#-- Alignment producer
+SiPixelAliMilleAlignmentProducerHG = SiPixelAliMilleAlignmentProducer.clone(
+    ParameterBuilder = dict(
+      Selector = cms.PSet(
+	alignParams = cms.vstring(
+	  "TrackerP1PXBLadder,111111",
+	  "TrackerP1PXECPanel,111111",
+	)
+      )
+    ),
+    tjTkAssociationMapTag = 'SiPixelAliTrackRefitterHG1',
+    algoConfig = MillePedeAlignmentAlgorithm.clone(
+	binaryFile = 'milleBinaryHG_0.dat',
+	treeFile = 'treeFileHG.root',
+	monitorFile = 'millePedeMonitorHG.root'
+    )
+)
+
+# Ingredient: SiPixelAliTrackerTrackHitFilter
+SiPixelAliTrackerTrackHitFilterHG = SiPixelAliTrackerTrackHitFilter.clone(
+	src = 'SiPixelAliTrackRefitterHG0'
+)
+
+# Ingredient: SiPixelAliSiPixelAliTrackFitter
+SiPixelAliTrackFitterHG = SiPixelAliTrackFitter.clone(
+	src = 'SiPixelAliTrackerTrackHitFilterHG'
+)
+
+SiPixelAliMillePedeFileConverterHG = cms.EDProducer("MillePedeFileConverter",
+                                                  fileDir = cms.string(SiPixelAliMilleAlignmentProducerHG.algoConfig.fileDir.value()),
+                                                  inputBinaryFile = cms.string(SiPixelAliMilleAlignmentProducerHG.algoConfig.binaryFile.value()),
+                                                  fileBlobLabel = cms.string(''),
+                                                 )
+
+
+
+seqALCARECOPromptCalibProdSiPixelAliHG = cms.Sequence(ALCARECOTkAlMinBiasFilterForSiPixelAliHG*
+                                                    lsNumberFilter*
+                                                    offlineBeamSpot*
+                                                    SiPixelAliHighPuritySelectorHG*
+                                                    SiPixelAliTrackRefitterHG0*
+                                                    SiPixelAliTrackerTrackHitFilterHG*
+                                                    SiPixelAliTrackFitterHG*
+                                                    SiPixelAliTrackSelectorHG*
+                                                    SiPixelAliTrackRefitterHG1*
+                                                    SiPixelAliMilleAlignmentProducerHG*
+                                                    SiPixelAliMillePedeFileConverterHG)

Alignment/CommonAlignmentProducer/python/ALCARECOPromptCalibProdSiPixelAli_Output_cff.py

@@ -8,7 +8,5 @@
         'keep *_SiPixelAliMillePedeFileConverter_*_*')
 )
 
-import copy
-
-OutALCARECOPromptCalibProdSiPixelAli=copy.deepcopy(OutALCARECOPromptCalibProdSiPixelAli_noDrop)
+OutALCARECOPromptCalibProdSiPixelAli=OutALCARECOPromptCalibProdSiPixelAli_noDrop.clone()
 OutALCARECOPromptCalibProdSiPixelAli.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_Output_cff.py

@@ -15,5 +15,16 @@
         'keep *_offlineBeamSpot_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
+import copy
+_run3_common_removedCommands = OutALCARECOTkAlJetHT_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*',
+                              'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlJetHT_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
 OutALCARECOTkAlJetHT = OutALCARECOTkAlJetHT_noDrop.clone()
 OutALCARECOTkAlJetHT.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMuHI_Output_cff.py

@@ -14,6 +14,15 @@
 	'keep *_hiSelectedVertex_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
-OutALCARECOTkAlJpsiMuMuHI = copy.deepcopy(OutALCARECOTkAlJpsiMuMuHI_noDrop)
+_run3_common_removedCommands = OutALCARECOTkAlJpsiMuMuHI_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlJpsiMuMuHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+OutALCARECOTkAlJpsiMuMuHI = OutALCARECOTkAlJpsiMuMuHI_noDrop.clone()
 OutALCARECOTkAlJpsiMuMuHI.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_Output_cff.py

@@ -14,6 +14,15 @@
 	'keep *_offlinePrimaryVertices_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
-OutALCARECOTkAlJpsiMuMu = copy.deepcopy(OutALCARECOTkAlJpsiMuMu_noDrop)
+_run3_common_removedCommands = OutALCARECOTkAlJpsiMuMu_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlJpsiMuMu_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+OutALCARECOTkAlJpsiMuMu = OutALCARECOTkAlJpsiMuMu_noDrop.clone()
 OutALCARECOTkAlJpsiMuMu.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBiasHI_Output_cff.py

@@ -15,6 +15,15 @@
         'keep *_offlineBeamSpot_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
+_run3_common_removedCommands = OutALCARECOTkAlMinBiasHI_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlMinBiasHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
 OutALCARECOTkAlMinBiasHI = copy.deepcopy(OutALCARECOTkAlMinBiasHI_noDrop)
 OutALCARECOTkAlMinBiasHI.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_Output_cff.py

@@ -15,6 +15,16 @@
         'keep *_offlineBeamSpot_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
-OutALCARECOTkAlMinBias = copy.deepcopy(OutALCARECOTkAlMinBias_noDrop)
+_run3_common_removedCommands = OutALCARECOTkAlMinBias_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*',
+                              'keep OnlineLuminosityRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlMinBias_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+OutALCARECOTkAlMinBias = OutALCARECOTkAlMinBias_noDrop.clone()
 OutALCARECOTkAlMinBias.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolatedHI_Output_cff.py

@@ -14,6 +14,15 @@
 	'keep *_hiSelectedVertex_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
-OutALCARECOTkAlMuonIsolatedHI = copy.deepcopy(OutALCARECOTkAlMuonIsolatedHI_noDrop)
+_run3_common_removedCommands = OutALCARECOTkAlMuonIsolatedHI_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlMuonIsolatedHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+OutALCARECOTkAlMuonIsolatedHI = OutALCARECOTkAlMuonIsolatedHI_noDrop.clone()
 OutALCARECOTkAlMuonIsolatedHI.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_Output_cff.py

@@ -14,6 +14,15 @@
 	'keep *_offlinePrimaryVertices_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
-OutALCARECOTkAlMuonIsolated = copy.deepcopy(OutALCARECOTkAlMuonIsolated_noDrop)
+_run3_common_removedCommands = OutALCARECOTkAlMuonIsolated_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlMuonIsolated_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+OutALCARECOTkAlMuonIsolated = OutALCARECOTkAlMuonIsolated_noDrop.clone()
 OutALCARECOTkAlMuonIsolated.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMuHI_Output_cff.py

@@ -14,6 +14,15 @@
 	'keep *_hiSelectedVertex_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
-OutALCARECOTkAlUpsilonMuMuHI = copy.deepcopy(OutALCARECOTkAlUpsilonMuMuHI_noDrop)
+_run3_common_removedCommands = OutALCARECOTkAlUpsilonMuMuHI_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlUpsilonMuMuHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+OutALCARECOTkAlUpsilonMuMuHI = OutALCARECOTkAlUpsilonMuMuHI_noDrop.clone()
 OutALCARECOTkAlUpsilonMuMuHI.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_Output_cff.py

@@ -14,6 +14,15 @@
 	'keep *_offlinePrimaryVertices_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
-OutALCARECOTkAlUpsilonMuMu = copy.deepcopy(OutALCARECOTkAlUpsilonMuMu_noDrop)
+_run3_common_removedCommands = OutALCARECOTkAlUpsilonMuMu_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlUpsilonMuMu_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+OutALCARECOTkAlUpsilonMuMu = OutALCARECOTkAlUpsilonMuMu_noDrop.clone()
 OutALCARECOTkAlUpsilonMuMu.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMuHI_Output_cff.py

@@ -14,6 +14,15 @@
 	'keep *_hiSelectedVertex_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
-OutALCARECOTkAlZMuMuHI = copy.deepcopy(OutALCARECOTkAlZMuMuHI_noDrop)
+_run3_common_removedCommands = OutALCARECOTkAlZMuMuHI_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlZMuMuHI_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+OutALCARECOTkAlZMuMuHI = OutALCARECOTkAlZMuMuHI_noDrop.clone()
 OutALCARECOTkAlZMuMuHI.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_Output_cff.py

@@ -14,6 +14,15 @@
 	'keep *_offlinePrimaryVertices_*_*')
 )
 
+# in Run3, SCAL digis replaced by onlineMetaDataDigis
 import copy
-OutALCARECOTkAlZMuMu = copy.deepcopy(OutALCARECOTkAlZMuMu_noDrop)
+_run3_common_removedCommands = OutALCARECOTkAlZMuMu_noDrop.outputCommands.copy()
+_run3_common_removedCommands.remove('keep DcsStatuss_scalersRawToDigi_*_*')
+
+_run3_common_extraCommands = ['keep DCSRecord_onlineMetaDataDigis_*_*']
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(OutALCARECOTkAlZMuMu_noDrop, outputCommands = _run3_common_removedCommands + _run3_common_extraCommands)
+
+OutALCARECOTkAlZMuMu = OutALCARECOTkAlZMuMu_noDrop.clone()
 OutALCARECOTkAlZMuMu.outputCommands.insert(0, "drop *")

Alignment/CommonAlignmentProducer/python/AlcaSiPixelAliHarvesterHG_cff.py

@@ -0,0 +1,79 @@
+import FWCore.ParameterSet.Config as cms
+
+SiPixelAliMilleFileExtractorHG = cms.EDAnalyzer("MillePedeFileExtractor",
+    fileBlobInputTag = cms.InputTag("SiPixelAliMillePedeFileConverterHG",''),
+    fileDir = cms.string('HGalignment/'),
+    # File names the Extractor will use to write the fileblobs in the root
+    # file as real binary files to disk, so that the pede step can read them.
+    # This includes the formatting directive "%04d" which will be expanded to
+    # 0000, 0001, 0002,...
+    outputBinaryFile = cms.string('pedeBinaryHG%04d.dat'))
+
+from Alignment.MillePedeAlignmentAlgorithm.MillePedeAlignmentAlgorithm_cfi import *
+from Alignment.CommonAlignmentProducer.AlignmentProducerAsAnalyzer_cff import AlignmentProducer
+from Alignment.MillePedeAlignmentAlgorithm.MillePedeDQMModule_cff import *
+
+SiPixelAliPedeAlignmentProducerHG = AlignmentProducer.clone(
+    ParameterBuilder = dict(
+        Selector = cms.PSet(
+            alignParams = cms.vstring(
+                "TrackerP1PXBLadder,111111",
+                "TrackerP1PXECPanel,111111",
+            )
+        )
+    ),
+    doMisalignmentScenario = False,
+    checkDbAlignmentValidity = False,
+    applyDbAlignment = True,
+    tjTkAssociationMapTag = 'TrackRefitter2',
+    saveToDB = True,
+    trackerAlignmentRcdName = "TrackerAlignmentHGRcd"
+)
+
+SiPixelAliPedeAlignmentProducerHG.algoConfig = MillePedeAlignmentAlgorithm.clone(
+    mode = 'pede',
+    runAtPCL = True,
+    mergeBinaryFiles = [SiPixelAliMilleFileExtractorHG.outputBinaryFile.value()],
+    binaryFile = '',
+    TrajectoryFactory = cms.PSet(BrokenLinesTrajectoryFactory),
+    minNumHits = 10,
+    fileDir = 'HGalignment/',
+    pedeSteerer = dict(
+        pedeCommand = 'pede',
+        method = 'inversion  5  0.8',
+        options = [
+            #'regularisation 1.0 0.05', # non-stated pre-sigma 50 mrad or 500 mum
+            'entries 500',
+            'chisqcut  30.0  4.5',
+            'threads 1 1',
+            'closeandreopen',
+            'skipemptycons' 
+            #'outlierdownweighting 3','dwfractioncut 0.1'
+            #'outlierdownweighting 5','dwfractioncut 0.2'
+        ],
+        fileDir = 'HGalignment/',
+        runDir = 'HGalignment/',
+        steerFile = 'pedeSteerHG',
+        pedeDump = 'pedeHG.dump'
+    ),
+    pedeReader = dict(
+        fileDir = 'HGalignment/'
+    ),
+    MillePedeFileReader = dict(
+        fileDir = "HGalignment/",
+        isHG = True
+    )
+)
+
+SiPixelAliDQMModuleHG = SiPixelAliDQMModule.clone()
+SiPixelAliDQMModuleHG.MillePedeFileReader.fileDir = "HGalignment/"
+SiPixelAliDQMModuleHG.MillePedeFileReader.isHG = True
+
+from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
+dqmEnvSiPixelAliHG = DQMEDHarvester('DQMHarvestingMetadata',
+                                    subSystemFolder = cms.untracked.string('AlCaReco'))
+
+ALCAHARVESTSiPixelAliHG = cms.Sequence(SiPixelAliMilleFileExtractorHG*
+                                       SiPixelAliPedeAlignmentProducerHG*
+                                       SiPixelAliDQMModuleHG*
+                                       dqmEnvSiPixelAliHG)

Alignment/CommonAlignmentProducer/python/AlignmentProducerAsAnalyzer_cff.py

@@ -75,6 +75,9 @@
 
                     # update alignables if triggered by corresponding input IOV boundary
                     enableAlignableUpdates = cms.bool(False),
+
+                    # Change tracker alignment record name to avoid confusion bettwen HG and LG PCL alignment
+                    trackerAlignmentRcdName = cms.string("TrackerAlignmentRcd")
                     )
 import Geometry.DTGeometryBuilder.dtGeometryDB_cfi
 DTGeometryAlignmentProducerAsAnalyzer = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone()