Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop type specs in HLTEvF, MuonMonitor and Physics #36543

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
122 changes: 61 additions & 61 deletions DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py
Expand Up @@ -2,7 +2,7 @@

from TrackingTools.RecoGeometry.RecoGeometries_cff import *
hltESPDummyDetLayerGeometry = DummyDetLayerGeometry.clone(
ComponentName = cms.string( "hltESPDummyDetLayerGeometry" )
ComponentName = "hltESPDummyDetLayerGeometry"
)

# strip cluster monitor
Expand All @@ -15,64 +15,64 @@
## make sure they are not already defined somewhereelse in the final configuration
from RecoLocalTracker.SiPixelRecHits.PixelCPETemplateReco_cfi import templates
hltESPPixelCPETemplateReco = templates.clone(
LoadTemplatesFromDB = cms.bool( True ),
ComponentName = cms.string( "hltESPPixelCPETemplateReco" ),
Alpha2Order = cms.bool( True ),
ClusterProbComputationFlag = cms.int32( 0 ),
speed = cms.int32( -2 ),
UseClusterSplitter = cms.bool( False )
LoadTemplatesFromDB = True ,
ComponentName = "hltESPPixelCPETemplateReco" ,
Alpha2Order = True ,
ClusterProbComputationFlag = 0 ,
speed = -2 ,
UseClusterSplitter = False
)

from RecoLocalTracker.SiPixelRecHits.PixelCPEGeneric_cfi import PixelCPEGenericESProducer
hltESPPixelCPEGeneric = PixelCPEGenericESProducer.clone(
EdgeClusterErrorX = cms.double( 50.0 ),
DoCosmics = cms.bool( False ),
LoadTemplatesFromDB = cms.bool( True ),
UseErrorsFromTemplates = cms.bool( True ),
eff_charge_cut_highX = cms.double( 1.0 ),
TruncatePixelCharge = cms.bool( True ),
size_cutY = cms.double( 3.0 ),
size_cutX = cms.double( 3.0 ),
inflate_all_errors_no_trk_angle = cms.bool( False ),
IrradiationBiasCorrection = cms.bool( False ),
inflate_errors = cms.bool( False ),
eff_charge_cut_lowX = cms.double( 0.0 ),
eff_charge_cut_highY = cms.double( 1.0 ),
ClusterProbComputationFlag = cms.int32( 0 ),
EdgeClusterErrorY = cms.double( 85.0 ),
ComponentName = cms.string( "hltESPPixelCPEGeneric" ),
eff_charge_cut_lowY = cms.double( 0.0 ),
Alpha2Order = cms.bool( True )
EdgeClusterErrorX = 50.0 ,
DoCosmics = False ,
LoadTemplatesFromDB = True ,
UseErrorsFromTemplates = True ,
eff_charge_cut_highX = 1.0 ,
TruncatePixelCharge = True ,
size_cutY = 3.0 ,
size_cutX = 3.0 ,
inflate_all_errors_no_trk_angle = False ,
IrradiationBiasCorrection = False ,
inflate_errors = False ,
eff_charge_cut_lowX = 0.0 ,
eff_charge_cut_highY = 1.0 ,
ClusterProbComputationFlag = 0 ,
EdgeClusterErrorY = 85.0 ,
ComponentName = "hltESPPixelCPEGeneric" ,
eff_charge_cut_lowY = 0.0 ,
Alpha2Order = True
)

from RecoTracker.TransientTrackingRecHit.TTRHBuilderWithTemplate_cfi import TTRHBuilderAngleAndTemplate
hltESPTTRHBuilderAngleAndTemplate = TTRHBuilderAngleAndTemplate.clone(
StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ),
Matcher = cms.string( "StandardMatcher" ),
ComputeCoarseLocalPositionFromDisk = cms.bool( False ),
PixelCPE = cms.string( "hltESPPixelCPETemplateReco" ),
ComponentName = cms.string( "hltESPTTRHBuilderAngleAndTemplate" )
StripCPE = "hltESPStripCPEfromTrackAngle" ,
Matcher = "StandardMatcher" ,
ComputeCoarseLocalPositionFromDisk = False ,
PixelCPE = "hltESPPixelCPETemplateReco",
ComponentName ="hltESPTTRHBuilderAngleAndTemplate"
)
hltESPTTRHBWithTrackAngle = TTRHBuilderAngleAndTemplate.clone(
StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ),
Matcher = cms.string( "StandardMatcher" ),
ComputeCoarseLocalPositionFromDisk = cms.bool( False ),
PixelCPE = cms.string( "hltESPPixelCPEGeneric" ),
ComponentName = cms.string( "hltESPTTRHBWithTrackAngle" )
StripCPE = "hltESPStripCPEfromTrackAngle",
Matcher = "StandardMatcher",
ComputeCoarseLocalPositionFromDisk = False,
PixelCPE = "hltESPPixelCPEGeneric",
ComponentName = "hltESPTTRHBWithTrackAngle"
)

from RecoLocalTracker.SiStripRecHitConverter.StripCPEESProducer_cfi import stripCPEESProducer
hltESPStripCPEfromTrackAngle = stripCPEESProducer.clone(
ComponentType = cms.string( "StripCPEfromTrackAngle" ),
ComponentName = cms.string( "hltESPStripCPEfromTrackAngle" ),
ComponentType = "StripCPEfromTrackAngle" ,
ComponentName = "hltESPStripCPEfromTrackAngle",
parameters = cms.PSet(
mLC_P2 = cms.double( 0.3 ),
mLC_P1 = cms.double( 0.618 ),
mLC_P0 = cms.double( -0.326 ),
mLC_P2 = cms.double(0.3),
mLC_P1 = cms.double(0.618),
mLC_P0 = cms.double(-0.326),
# useLegacyError = cms.bool( True ), # 50ns menu
# maxChgOneMIP = cms.double( -6000.0 ), # 50ns menu
useLegacyError = cms.bool( False ), # 25ns menu
maxChgOneMIP = cms.double( 6000.0 ), #25ns menu
useLegacyError = cms.bool(False) , # 25ns menu
maxChgOneMIP = cms.double(6000.0) , #25ns menu
mTEC_P1 = cms.double( 0.471 ),
mTEC_P0 = cms.double( -1.885 ),
mTOB_P0 = cms.double( -1.026 ),
Expand All @@ -86,17 +86,17 @@

from RecoTracker.TkNavigation.NavigationSchoolESProducer_cfi import navigationSchoolESProducer
navigationSchoolESProducer = navigationSchoolESProducer.clone(
ComponentName = cms.string( "SimpleNavigationSchool" ),
SimpleMagneticField = cms.string( "ParabolicMf" )
ComponentName = "SimpleNavigationSchool" ,
SimpleMagneticField ="ParabolicMf"
)

from RecoTracker.MeasurementDet.MeasurementTrackerESProducer_cfi import MeasurementTracker
hltESPMeasurementTracker = MeasurementTracker.clone(
UseStripStripQualityDB = cms.bool( True ),
StripCPE = cms.string( "hltESPStripCPEfromTrackAngle" ),
UsePixelROCQualityDB = cms.bool( True ),
DebugPixelROCQualityDB = cms.untracked.bool( False ),
UseStripAPVFiberQualityDB = cms.bool( True ),
UseStripStripQualityDB = True ,
StripCPE = "hltESPStripCPEfromTrackAngle",
UsePixelROCQualityDB = True ,
DebugPixelROCQualityDB = False,
UseStripAPVFiberQualityDB = True ,
badStripCuts = cms.PSet(
TOB = cms.PSet(
maxConsecutiveBad = cms.uint32( 9999 ),
Expand All @@ -115,17 +115,17 @@
maxBad = cms.uint32( 9999 )
)
),
DebugStripModuleQualityDB = cms.untracked.bool( False ),
ComponentName = cms.string( "hltESPMeasurementTracker" ),
DebugPixelModuleQualityDB = cms.untracked.bool( False ),
UsePixelModuleQualityDB = cms.bool( True ),
DebugStripAPVFiberQualityDB = cms.untracked.bool( False ),
HitMatcher = cms.string( "StandardMatcher" ),
DebugStripStripQualityDB = cms.untracked.bool( False ),
PixelCPE = cms.string( "hltESPPixelCPEGeneric" ),
SiStripQualityLabel = cms.string( "" ),
UseStripModuleQualityDB = cms.bool( True ),
MaskBadAPVFibers = cms.bool( True )
DebugStripModuleQualityDB = False ,
ComponentName ="hltESPMeasurementTracker",
DebugPixelModuleQualityDB = False,
UsePixelModuleQualityDB = True,
DebugStripAPVFiberQualityDB = False,
HitMatcher = "StandardMatcher",
DebugStripStripQualityDB = False,
PixelCPE = "hltESPPixelCPEGeneric",
SiStripQualityLabel = "" ,
UseStripModuleQualityDB = True,
MaskBadAPVFibers = True
)

hltESPRungeKuttaTrackerPropagator = cms.ESProducer( "PropagatorWithMaterialESProducer",
Expand All @@ -140,7 +140,7 @@

from TrackingTools.KalmanUpdators.KFUpdatorESProducer_cfi import KFUpdatorESProducer
hltESPKFUpdator = KFUpdatorESProducer.clone(
ComponentName = cms.string( "hltESPKFUpdator" )
ComponentName = "hltESPKFUpdator"
)

hltESPChi2MeasurementEstimator30 = cms.ESProducer( "Chi2MeasurementEstimatorESProducer",
Expand Down
12 changes: 6 additions & 6 deletions DQM/HLTEvF/python/HLTTrackingMonitoring_Client_cff.py
Expand Up @@ -3,25 +3,25 @@
# tracking monitor
from DQMOffline.Trigger.TrackingMonitoring_Client_cff import *

trackingEffFromHitPatternHLT = trackingEffFromHitPattern.clone()
trackingEffFromHitPatternHLT.subDirs = cms.untracked.vstring(
trackingEffFromHitPatternHLT = trackingEffFromHitPattern.clone(
subDirs = (
"HLT/Tracking/pixelTracks/HitEffFromHitPattern*",
"HLT/Tracking/iter2Merged/HitEffFromHitPattern*"
)

)
# Sequence
trackingMonitorClientHLT = cms.Sequence(
trackingEffFromHitPatternHLT
)

# EGM tracking
trackingForElectronsEffFromHitPatternHLT = trackingEffFromHitPattern.clone()
trackingForElectronsEffFromHitPatternHLT.subDirs = cms.untracked.vstring(
trackingForElectronsEffFromHitPatternHLT = trackingEffFromHitPattern.clone(
subDirs = (
"HLT/EGM/Tracking/GSF/HitEffFromHitPattern*",
"HLT/EGM/Tracking/pixelTracks/HitEffFromHitPattern*",
"HLT/EGM/Tracking/iter2Merged/HitEffFromHitPattern*"
)

)
# Sequence
trackingForElectronsMonitorClientHLT = cms.Sequence(
trackingForElectronsEffFromHitPatternHLT
Expand Down
6 changes: 3 additions & 3 deletions DQM/HLTEvF/python/HLTTrackingMonitoring_cff.py
Expand Up @@ -2,9 +2,9 @@

# tracking monitor
from DQMOffline.Trigger.TrackingMonitoring_cff import *
iterHLTTracksMonitoringHLT.doProfilesVsLS = cms.bool(True)
iterHLTTracksMonitoringHLT.beamSpot = cms.InputTag("hltOnlineBeamSpot")
pixelTracksMonitoringHLT.beamSpot = cms.InputTag("hltOnlineBeamSpot")
doProfilesVsLS = True
beamSpot = "hltOnlineBeamSpot"
beamSpot = "hltOnlineBeamSpot"
NiharSaha marked this conversation as resolved.
Show resolved Hide resolved

from TrackingTools.TrackFitters.KFTrajectoryFitter_cfi import *
from TrackingTools.TransientTrack.TransientTrackBuilder_cfi import *
Expand Down
17 changes: 9 additions & 8 deletions DQM/MuonMonitor/python/muonCosmicAnalyzer_cff.py
Expand Up @@ -12,14 +12,15 @@
from DQMOffline.Muon.muonSeedsAnalyzer_cfi import *
from DQM.MuonMonitor.muonRecoAnalyzer_cfi import *

#muonCosmicGlbSegmentAnalyzer = glbMuonSegmentAnalyzer.clone()
muonCosmicStaSegmentAnalyzer = staMuonSegmentAnalyzer.clone()
muonCosmicSeedAnalyzer = muonSeedsAnalyzer.clone()


#muonCosmicGlbSegmentAnalyzer.MuTrackCollection = cms.InputTag('globalCosmicMuons')
muonCosmicSeedAnalyzer.SeedCollection = cms.InputTag('CosmicMuonSeed')
muonCosmicStaSegmentAnalyzer.MuTrackCollection = cms.InputTag('cosmicMuons')
#muonCosmicGlbSegmentAnalyzer = glbMuonSegmentAnalyzer.clone(
#MuTrackCollection = 'globalCosmicMuons'
#)
muonCosmicStaSegmentAnalyzer = staMuonSegmentAnalyzer.clone(
MuTrackCollection = 'cosmicMuons'
)
muonCosmicSeedAnalyzer = muonSeedsAnalyzer.clone(
SeedCollection = 'CosmicMuonSeed'
)



Expand Down
2 changes: 1 addition & 1 deletion DQM/Physics/python/DQMPhysics_cff.py
Expand Up @@ -56,7 +56,7 @@
pp_on_AA.toModify(CentralityDQM, vertexcollection=cms.InputTag("offlinePrimaryVertices"))
pp_on_AA.toReplaceWith(dqmPhysics, _dqmPhysics)

bphysicsOniaDQMHI = bphysicsOniaDQM.clone(vertex=cms.InputTag("hiSelectedVertex"))
bphysicsOniaDQMHI = bphysicsOniaDQM.clone(vertex="hiSelectedVertex")
dqmPhysicsHI = cms.Sequence(bphysicsOniaDQMHI+CentralityDQM)

from DQM.Physics.qcdPhotonsCosmicDQM_cff import *
Expand Down
4 changes: 2 additions & 2 deletions DQM/Physics/python/qcdPhotonsCosmicDQM_cff.py
Expand Up @@ -2,6 +2,6 @@

import DQM.Physics.qcdPhotonsDQM_cfi
qcdPhotonsCosmicDQM = DQM.Physics.qcdPhotonsDQM_cfi.qcdPhotonsDQM.clone(
barrelRecHitTag = cms.InputTag("ecalRecHit:EcalRecHitsEB"),
endcapRecHitTag = cms.InputTag("ecalRecHit:EcalRecHitsEE")
barrelRecHitTag = "ecalRecHit:EcalRecHitsEB",
endcapRecHitTag = "ecalRecHit:EcalRecHitsEE"
)
4 changes: 2 additions & 2 deletions DQM/Physics/python/topJetCorrectionHelper_cfi.py
Expand Up @@ -15,6 +15,6 @@
topDQMak5PFCHSL3Absolute = ak4PFCHSL3Absolute.clone()
topDQMak5PFCHSResidual = ak4PFCHSResidual.clone()

topDQMak5PFCHSL2L3 = ak4PFCHSL2L3.clone(correctors = cms.vstring('topDQMak5PFCHSL2Relative','topDQMak5PFCHSL3Absolute'))
topDQMak5PFCHSL2L3Residual = ak4PFCHSL2L3Residual.clone(correctors = cms.vstring('topDQMak5PFCHSL2Relative','topDQMak5PFCHSL3Absolute','topDQMak5PFCHSResidual'))
topDQMak5PFCHSL2L3 = ak4PFCHSL2L3.clone(correctors = ('topDQMak5PFCHSL2Relative','topDQMak5PFCHSL3Absolute'))
topDQMak5PFCHSL2L3Residual = ak4PFCHSL2L3Residual.clone(correctors = ('topDQMak5PFCHSL2Relative','topDQMak5PFCHSL3Absolute','topDQMak5PFCHSResidual'))
#############################################################################