From aeffc457daf6341d546449b19535f0f557a9d772 Mon Sep 17 00:00:00 2001 From: Oz Amram Date: Wed, 18 Sep 2019 10:09:27 -0500 Subject: [PATCH 1/8] Copied marcos commits --- Configuration/AlCa/python/autoCondPhase2.py | 48 +++++++++++-------- .../trackingRecoMaterialAnalyzer_cfi.py | 3 -- .../python/lowPtGsfElectronSeeds_cfi.py | 4 -- .../python/PixelCPEClusterRepair_cfi.py | 7 --- .../python/PixelCPEGeneric_cfi.py | 11 ----- .../python/PixelCPETemplateReco_cfi.py | 7 --- .../MergeDisplacedTrackCollections_cff.py | 4 -- .../GlobalTrajectoryBuilderCommon_cff.py | 8 ---- .../python/TrackerKinkFinder_cfi.py | 5 -- .../python/MuonTrackLoader_cff.py | 5 -- .../python/trackerDrivenElectronSeeds_cfi.py | 5 -- .../python/MergeTrackCollections_cff.py | 4 -- .../python/inOutSeedsFromTrackerMuons_cfi.py | 6 --- .../TrackProducer/python/TrackProducer_cfi.py | 6 --- 14 files changed, 27 insertions(+), 96 deletions(-) diff --git a/Configuration/AlCa/python/autoCondPhase2.py b/Configuration/AlCa/python/autoCondPhase2.py index c63274939ed63..1d8e34d0e75ce 100644 --- a/Configuration/AlCa/python/autoCondPhase2.py +++ b/Configuration/AlCa/python/autoCondPhase2.py @@ -13,39 +13,45 @@ allTags["LA"] = { - 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_v0_mc' ,SiPixelLARecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), - 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_v0_mc' ,SiPixelLARecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), - 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_v0_mc' ,SiPixelLARecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), + 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_v1_mc' ,SiPixelLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_v1_mc' ,SiPixelLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_v1_mc' ,SiPixelLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) } allTags["LAWidth"] = { - 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T6_v0_mc' ,SiPixelLARecord,connectionString, "forWidth", "2019-07-15 12:00:00.000"] ), ), - 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T14_v0_mc' ,SiPixelLARecord,connectionString, "forWidth", "2019-07-15 12:00:00.000"] ), ), - 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T15_v0_mc' ,SiPixelLARecord,connectionString, "forWidth", "2019-07-15 12:00:00.000"] ), ), + 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T6_v0_mc' ,SiPixelLARecord,connectionString, "forWidth", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T14_v0_mc' ,SiPixelLARecord,connectionString, "forWidth", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T15_v0_mc' ,SiPixelLARecord,connectionString, "forWidth", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) } -allTags["SimLA"] = { - 'T6' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T6_v0_mc' ,SiPixelSimLARecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), - 'T14' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T14_v0_mc' ,SiPixelSimLARecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), - 'T15' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T15_v0_mc' ,SiPixelSimLARecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), +allTags["LAfromAlignment"] = { + 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T6_v0_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T14_v0_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T15_v0_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (not in use) } -## -## All of the following conditions are not yet in active use, but will be activated in GT along the way -## +allTags["SimLA"] = { + 'T6' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T6_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T14' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T14_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T15' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T15_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) +} allTags["GenError"] = { - 'T6' : ( ','.join( [ 'SiPixelGenErrorDBOject_phase2_T6_v0_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), - 'T14' : ( ','.join( [ 'SiPixelGenErrorDBOject_phase2_T14_v0_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), - 'T15' : ( ','.join( [ 'SiPixelGenErrorDBOject_phase2_T15_v0_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), + 'T6' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T6_v0_mc_100x25' ,SiPixelGenErrorRecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T14' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T14_v0_mc_100x25' ,SiPixelGenErrorRecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T15' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T15_v0_mc_100x25' ,SiPixelGenErrorRecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V } allTags["Template"] = { - 'T6' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T6_v0_mc' ,SiPixelTemplatesRecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), - 'T14' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T14_v0_mc' ,SiPixelTemplatesRecord,connectionString, "", "2019-07-15 12:00:00.000"] ), ), - 'T15' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T15_v0_mc' ,SiPixelTemplatesRecord,connectionString, "" , "2019-07-15 12:00:00.000"] ), ), + 'T6' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T6_v0_mc_100x25' ,SiPixelTemplatesRecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T14' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T14_v0_mc_100x25' ,SiPixelTemplatesRecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T15' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T15_v0_mc_100x25' ,SiPixelTemplatesRecord,connectionString, "" , "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V } +## +## All of the following conditions are not yet in active use, but will be activated in GT along the way +## + allTags["Template2Dnum"] = { 'T6' : ( ','.join( [ 'SiPixel2DTemplateDBObject_phase2_T6_v0_num' ,SiPixel2DTemplatesRecord,connectionString, "numerator", "2019-07-15 12:00:00.000"] ), ), 'T14' : ( ','.join( [ 'SiPixel2DTemplateDBObject_phase2_T14_v0_num' ,SiPixel2DTemplatesRecord,connectionString, "numerator", "2019-07-15 12:00:00.000"] ), ), @@ -59,7 +65,7 @@ } # list of active tags to be replaced -activeKeys = ["LA","LAWidth","SimLA"] +activeKeys = ["LA","LAWidth","SimLA","LAfromAlignment","GenError","Template"] # list of geometries supported activeDets = ["T6","T14","T15"] @@ -70,7 +76,7 @@ appendedTags += allTags[key][det] phase2GTs["phase2_realistic_"+det] = ('phase2_realistic', appendedTags) -# method called in autoAlCa +# method called in autoCond def autoCondPhase2(autoCond): for key,val in six.iteritems(phase2GTs): if len(val)==1 : diff --git a/DQM/TrackingMonitor/python/trackingRecoMaterialAnalyzer_cfi.py b/DQM/TrackingMonitor/python/trackingRecoMaterialAnalyzer_cfi.py index 31831d8618352..c5fdd6ba83b27 100644 --- a/DQM/TrackingMonitor/python/trackingRecoMaterialAnalyzer_cfi.py +++ b/DQM/TrackingMonitor/python/trackingRecoMaterialAnalyzer_cfi.py @@ -20,9 +20,6 @@ PropagatorOpposite = cms.string("RungeKuttaTrackerPropagatorOpposite") ) -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(materialDumperAnalyzer, TrackerRecHitBuilder='WithTrackAngle') - materialDumper = cms.Sequence(materialDumperAnalyzer) materialDumper_step = cms.Path(materialDumper) diff --git a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py index b5f51ebea10d1..e2ebe3e89dbeb 100644 --- a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py @@ -43,10 +43,6 @@ def thresholds( wp ) : _fastSim_lowPtGsfElectronSeeds.PreGsfLabel = cms.string("") fastSim.toReplaceWith(lowPtGsfElectronSeeds,_fastSim_lowPtGsfElectronSeeds) -# Modifiers for Phase2 -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(lowPtGsfElectronSeeds, TTRHBuilder = 'WithTrackAngle') - # Modifiers for BParking from Configuration.Eras.Modifier_bParking_cff import bParking bParking.toModify(lowPtGsfElectronSeeds, ModelThresholds = thresholds("VL") ) diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py index 6d2280e44f6d9..f3f0697ca8a77 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEClusterRepair_cfi.py @@ -3,10 +3,3 @@ from RecoLocalTracker.SiPixelRecHits._templates2_default_cfi import _templates2_default templates2 = _templates2_default.clone() -# This customization will be removed once we get the templates for phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(templates2, - LoadTemplatesFromDB = False, - DoLorentz = False, -) - diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py index c67bac0a25f43..b9e7cef17f9e9 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py @@ -8,14 +8,3 @@ from Configuration.Eras.Modifier_run3_common_cff import run3_common run3_common.toModify(PixelCPEGenericESProducer, IrradiationBiasCorrection = True) -# This customization will be removed once we get the templates for phase2 pixel -# FIXME::Is the Upgrade variable actually used? -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(PixelCPEGenericESProducer, - UseErrorsFromTemplates = False, - LoadTemplatesFromDB = False, - TruncatePixelCharge = False, - IrradiationBiasCorrection = False, - DoCosmics = False, - Upgrade = cms.bool(True) -) diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py index e62797402f6f9..3c74bbe3c75ff 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py @@ -3,10 +3,3 @@ from RecoLocalTracker.SiPixelRecHits._templates_default_cfi import _templates_default templates = _templates_default.clone() -# This customization will be removed once we get the templates for phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(templates, - LoadTemplatesFromDB = False, - DoLorentz = False, -) - diff --git a/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py b/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py index c74adcaef88fc..89216e0cf3f49 100644 --- a/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py +++ b/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py @@ -55,7 +55,3 @@ ) displacedTracksSequence = cms.Sequence(displacedTracksTask) -# This customization will be removed once we get the templates for -# phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(duplicateDisplacedTrackCandidates, ttrhBuilderName = "WithTrackAngle") # FIXME diff --git a/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py b/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py index d9e95b57a27d9..ce28bf73694dc 100644 --- a/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py +++ b/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py @@ -79,11 +79,3 @@ ), ) -# This customization will be removed once we get the templates for -# phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(GlobalTrajectoryBuilderCommon, # FIXME - TrackerRecHitBuilder = 'WithTrackAngle', - TrackTransformer = dict(TrackerRecHitBuilder = 'WithTrackAngle'), - GlbRefitterParameters = dict(TrackerRecHitBuilder = 'WithTrackAngle'), -) diff --git a/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py b/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py index 3d511d4eb80ae..a0c86ac1d4cbf 100644 --- a/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py +++ b/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py @@ -19,8 +19,3 @@ ) ) -# This customization will be removed once we get the templates for -# phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(TrackerKinkFinderParametersBlock, TrackerKinkFinderParameters = dict(TrackerRecHitBuilder = 'WithTrackAngle')) # FIXME - diff --git a/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py b/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py index 924f514f75c7c..592b6959f4f3b 100644 --- a/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py +++ b/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py @@ -88,8 +88,3 @@ ) ) -# This customization will be removed once we get the templates for -# phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(MuonTrackLoaderForGLB, TrackLoaderParameters = dict(TTRHBuilder = 'WithTrackAngle')) # FIXME - diff --git a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py index 28e58d27c5084..2bbe0f2c41b83 100644 --- a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py +++ b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py @@ -49,11 +49,6 @@ Min_dr = cms.double(0.2) ) -# This customization will be removed once we get the templates for -# phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(trackerDrivenElectronSeeds, TTRHBuilder = 'WithTrackAngle') # FIXME - from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 for e in [pp_on_XeXe_2017, pp_on_AA_2018]: diff --git a/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py b/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py index 207053b8d8bd9..90600a1eb38e3 100644 --- a/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py +++ b/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py @@ -30,10 +30,6 @@ duplicateTrackClassifier.mva.minLayers = [0,0,0] duplicateTrackClassifier.mva.min3DLayers = [0,0,0] duplicateTrackClassifier.mva.maxLostLayers = [99,99,99] -# This customization will be removed once we get the templates for -# phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(duplicateTrackCandidates, ttrhBuilderName = "WithTrackAngle") # FIXME generalTracks = DuplicateListMerger.clone() generalTracks.originalSource = cms.InputTag("preDuplicateMergingGeneralTracks") diff --git a/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py b/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py index 2826792262d0a..31989b0c9c1aa 100644 --- a/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py +++ b/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py @@ -21,9 +21,3 @@ RefitRPCHits = cms.bool(True), Propagator = cms.string('SmartPropagatorAnyRKOpposite'), ) - -# This customization will be removed once we get the templates for -# phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(inOutSeedsFromTrackerMuons, TrackerRecHitBuilder = 'WithTrackAngle') # FIXME - diff --git a/RecoTracker/TrackProducer/python/TrackProducer_cfi.py b/RecoTracker/TrackProducer/python/TrackProducer_cfi.py index 78ac45734d16d..adb0d87786d3f 100644 --- a/RecoTracker/TrackProducer/python/TrackProducer_cfi.py +++ b/RecoTracker/TrackProducer/python/TrackProducer_cfi.py @@ -26,9 +26,3 @@ MeasurementTracker = cms.string(''), MeasurementTrackerEvent = cms.InputTag('MeasurementTrackerEvent'), ) - -# This customization will be removed once we get the templates for -# phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(TrackProducer, TTRHBuilder = 'WithTrackAngle') # FIXME - From b79d8a477bed6c98c0e7fbf08416b645f2c5ee2e Mon Sep 17 00:00:00 2001 From: Oz Amram Date: Wed, 18 Sep 2019 10:16:15 -0500 Subject: [PATCH 2/8] Increase local template and gen error object sizes --- CondFormats/SiPixelTransient/interface/SiPixelGenError.h | 6 +++--- CondFormats/SiPixelTransient/interface/SiPixelTemplate.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CondFormats/SiPixelTransient/interface/SiPixelGenError.h b/CondFormats/SiPixelTransient/interface/SiPixelGenError.h index 5a61c6160de09..4e4d07e3c5533 100644 --- a/CondFormats/SiPixelTransient/interface/SiPixelGenError.h +++ b/CondFormats/SiPixelTransient/interface/SiPixelGenError.h @@ -77,12 +77,12 @@ struct SiPixelGenErrorStore { //!< template storage structure SiPixelGenErrorHeader head; #ifndef SI_PIXEL_TEMPLATE_USE_BOOST float cotbetaY[60]; - float cotbetaX[5]; - float cotalphaX[29]; + float cotbetaX[60]; + float cotalphaX[60]; //!< 60 Barrel y templates spanning cluster lengths from 0px to +18px [28 entries for fpix] SiPixelGenErrorEntry enty[60]; //!< 29 Barrel x templates spanning cluster lengths from -6px (-1.125Rad) to +6px (+1.125Rad) in each of 5 slices [3x29 for fpix] - SiPixelGenErrorEntry entx[5][29]; + SiPixelGenErrorEntry entx[60][60]; #else float* cotbetaY; float* cotbetaX; diff --git a/CondFormats/SiPixelTransient/interface/SiPixelTemplate.h b/CondFormats/SiPixelTransient/interface/SiPixelTemplate.h index f3263ec31e514..830d3e34f8830 100644 --- a/CondFormats/SiPixelTransient/interface/SiPixelTemplate.h +++ b/CondFormats/SiPixelTransient/interface/SiPixelTemplate.h @@ -207,12 +207,12 @@ struct SiPixelTemplateStore { //!< template storage structure SiPixelTemplateHeader head; #ifndef SI_PIXEL_TEMPLATE_USE_BOOST float cotbetaY[60]; - float cotbetaX[5]; - float cotalphaX[29]; + float cotbetaX[60]; + float cotalphaX[60]; //!< 60 Barrel y templates spanning cluster lengths from 0px to +18px [28 entries for fpix] SiPixelTemplateEntry enty[60]; //!< 29 Barrel x templates spanning cluster lengths from -6px (-1.125Rad) to +6px (+1.125Rad) in each of 5 slices [3x29 for fpix] - SiPixelTemplateEntry entx[5][29]; + SiPixelTemplateEntry entx[60][60]; void destroy(){}; #else float* cotbetaY = nullptr; From 586c89567222222aa74e5b9ad5f254ffba85e854 Mon Sep 17 00:00:00 2001 From: Cristina Date: Mon, 4 Nov 2019 14:06:05 -0600 Subject: [PATCH 3/8] v2 conditions --- Configuration/AlCa/python/autoCondPhase2.py | 44 ++++++++++++--------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/Configuration/AlCa/python/autoCondPhase2.py b/Configuration/AlCa/python/autoCondPhase2.py index 1d8e34d0e75ce..ab984ba9c6e57 100644 --- a/Configuration/AlCa/python/autoCondPhase2.py +++ b/Configuration/AlCa/python/autoCondPhase2.py @@ -13,39 +13,45 @@ allTags["LA"] = { - 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_v1_mc' ,SiPixelLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_v1_mc' ,SiPixelLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_v1_mc' ,SiPixelLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_v2_mc' ,SiPixelLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.106/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_v2_mc' ,SiPixelLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.106/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_v2_mc' ,SiPixelLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T16' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T16_v2_mc' ,SiPixelLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) } allTags["LAWidth"] = { - 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T6_v0_mc' ,SiPixelLARecord,connectionString, "forWidth", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) - 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T14_v0_mc' ,SiPixelLARecord,connectionString, "forWidth", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) - 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T15_v0_mc' ,SiPixelLARecord,connectionString, "forWidth", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T16' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T16_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), } allTags["LAfromAlignment"] = { - 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T6_v0_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (not in use) - 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T14_v0_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (not in use) - 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_forWidth_T15_v0_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-09-16 20:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T16' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T16_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), } allTags["SimLA"] = { - 'T6' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T6_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T14' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T14_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T15' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T15_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T6' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T6_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T14' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T14_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T15' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T15_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T16' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T16_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), } allTags["GenError"] = { - 'T6' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T6_v0_mc_100x25' ,SiPixelGenErrorRecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T14' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T14_v0_mc_100x25' ,SiPixelGenErrorRecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T15' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T15_v0_mc_100x25' ,SiPixelGenErrorRecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T6' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T6_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T14' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T14_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T15' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T15_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T16' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T16_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), } allTags["Template"] = { - 'T6' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T6_v0_mc_100x25' ,SiPixelTemplatesRecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T14' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T14_v0_mc_100x25' ,SiPixelTemplatesRecord,connectionString, "", "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T15' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T15_v0_mc_100x25' ,SiPixelTemplatesRecord,connectionString, "" , "2019-09-16 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T6' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T6_v2_mc' ,SiPixelTemplatesRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T14' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T14_v2_mc' ,SiPixelTemplatesRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T15' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T15_v2_mc' ,SiPixelTemplatesRecord,connectionString, "" , "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T16' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T16_v2_mc' ,SiPixelTemplatesRecord,connectionString, "" , "2019-11-05 20:00:00.000"] ), ), } ## @@ -68,7 +74,7 @@ activeKeys = ["LA","LAWidth","SimLA","LAfromAlignment","GenError","Template"] # list of geometries supported -activeDets = ["T6","T14","T15"] +activeDets = ["T6","T14","T15","T16"] phase2GTs = {} for det in activeDets: appendedTags = () From c1d69b4e61acecfab3411215c8e5f2ca3bbe8370 Mon Sep 17 00:00:00 2001 From: Cristina Date: Mon, 4 Nov 2019 16:50:03 -0600 Subject: [PATCH 4/8] remove t16 --- Configuration/AlCa/python/autoCondPhase2.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Configuration/AlCa/python/autoCondPhase2.py b/Configuration/AlCa/python/autoCondPhase2.py index ab984ba9c6e57..9b726b61a75bf 100644 --- a/Configuration/AlCa/python/autoCondPhase2.py +++ b/Configuration/AlCa/python/autoCondPhase2.py @@ -16,42 +16,36 @@ 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_v2_mc' ,SiPixelLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.106/T (TBPX), uH=0.0/T (TEPX+TFPX) 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_v2_mc' ,SiPixelLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.106/T (TBPX), uH=0.0/T (TEPX+TFPX) 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_v2_mc' ,SiPixelLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T16' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T16_v2_mc' ,SiPixelLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) } allTags["LAWidth"] = { 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) - 'T16' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T16_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), } allTags["LAfromAlignment"] = { 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) - 'T16' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T16_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), } allTags["SimLA"] = { 'T6' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T6_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) 'T14' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T14_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) 'T15' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T15_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), #uH = 0.0431/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T16' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T16_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), } allTags["GenError"] = { 'T6' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T6_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V 'T14' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T14_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V 'T15' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T15_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T16' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T16_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), } allTags["Template"] = { 'T6' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T6_v2_mc' ,SiPixelTemplatesRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V 'T14' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T14_v2_mc' ,SiPixelTemplatesRecord,connectionString, "", "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V 'T15' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T15_v2_mc' ,SiPixelTemplatesRecord,connectionString, "" , "2019-11-05 20:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T16' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T16_v2_mc' ,SiPixelTemplatesRecord,connectionString, "" , "2019-11-05 20:00:00.000"] ), ), } ## @@ -74,7 +68,7 @@ activeKeys = ["LA","LAWidth","SimLA","LAfromAlignment","GenError","Template"] # list of geometries supported -activeDets = ["T6","T14","T15","T16"] +activeDets = ["T6","T14","T15"] phase2GTs = {} for det in activeDets: appendedTags = () From 73abc0b7f36b6de42c8ff25967bc794428052582 Mon Sep 17 00:00:00 2001 From: Cristina Date: Tue, 5 Nov 2019 09:02:51 -0600 Subject: [PATCH 5/8] remove phase2 old customization for muons --- .../GlobalTrackingTools/python/GlobalMuonRefitter_cff.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py b/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py index f9eb3514cbf84..a4b3b58d0e3b9 100644 --- a/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py +++ b/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py @@ -53,11 +53,6 @@ RefitFlag = cms.bool( True ) ) -# This customization will be removed once we get the templates for -# phase2 pixel -from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker -phase2_tracker.toModify(GlobalMuonRefitter, TrackerRecHitBuilder = 'WithTrackAngle') # FIXME - from Configuration.Eras.Modifier_fastSim_cff import fastSim # FastSim doesn't use Runge Kute for propagation fastSim.toModify(GlobalMuonRefitter, Propagator = "SmartPropagatorAny") From be8d81cfd25b8481d9896f3ffc8fb5e5bce30b65 Mon Sep 17 00:00:00 2001 From: Cristina Date: Tue, 5 Nov 2019 16:07:56 -0600 Subject: [PATCH 6/8] fix tag --- Configuration/AlCa/python/autoCondPhase2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Configuration/AlCa/python/autoCondPhase2.py b/Configuration/AlCa/python/autoCondPhase2.py index 9b726b61a75bf..7b822a9995c2e 100644 --- a/Configuration/AlCa/python/autoCondPhase2.py +++ b/Configuration/AlCa/python/autoCondPhase2.py @@ -25,9 +25,9 @@ } allTags["LAfromAlignment"] = { - 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) - 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) - 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) } allTags["SimLA"] = { From ef2998b90a784bd8ab539d5710acd514060eaa6d Mon Sep 17 00:00:00 2001 From: Cristina Date: Tue, 26 Nov 2019 11:17:19 -0600 Subject: [PATCH 7/8] define templates sizes --- .../interface/SiPixelGenError.h | 20 ++++++++++--------- .../interface/SiPixelTemplate.h | 18 ++++++++--------- .../interface/SiPixelTemplateDefs.h | 4 +++- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/CondFormats/SiPixelTransient/interface/SiPixelGenError.h b/CondFormats/SiPixelTransient/interface/SiPixelGenError.h index 4e4d07e3c5533..d9c5fd4d8feed 100644 --- a/CondFormats/SiPixelTransient/interface/SiPixelGenError.h +++ b/CondFormats/SiPixelTransient/interface/SiPixelGenError.h @@ -17,6 +17,8 @@ #ifndef SiPixelGenError_h #define SiPixelGenError_h 1 +#include "SiPixelTemplateDefs.h" + #include #include #include "boost/multi_array.hpp" @@ -76,19 +78,19 @@ struct SiPixelGenErrorHeader { //!< template header structure struct SiPixelGenErrorStore { //!< template storage structure SiPixelGenErrorHeader head; #ifndef SI_PIXEL_TEMPLATE_USE_BOOST - float cotbetaY[60]; - float cotbetaX[60]; - float cotalphaX[60]; - //!< 60 Barrel y templates spanning cluster lengths from 0px to +18px [28 entries for fpix] - SiPixelGenErrorEntry enty[60]; - //!< 29 Barrel x templates spanning cluster lengths from -6px (-1.125Rad) to +6px (+1.125Rad) in each of 5 slices [3x29 for fpix] - SiPixelGenErrorEntry entx[60][60]; + float cotbetaY[TEMP_ENTRY_SIZEY]; + float cotbetaX[TEMP_ENTRY_SIZEX_B]; + float cotalphaX[TEMP_ENTRY_SIZEX_A]; + //!< 60 y templates spanning cluster lengths from 0px to +18px + SiPixelGenErrorEntry enty[TEMP_ENTRY_SIZEY]; + //!< 60 x templates spanning cluster lengths from -6px (-1.125Rad) to +6px (+1.125Rad) in each of 60 slices + SiPixelGenErrorEntry entx[TEMP_ENTRY_SIZEX_B][TEMP_ENTRY_SIZEX_A]; #else float* cotbetaY; float* cotbetaX; float* cotalphaX; - boost::multi_array enty; //!< use 1d entry to store [60] barrel entries or [28] fpix entries - //!< use 2d entry to store [5][29] barrel entries or [3][29] fpix entries + boost::multi_array enty; //!< use 1d entry to store [60] entries + //!< use 2d entry to store [60][60] entries boost::multi_array entx; #endif }; diff --git a/CondFormats/SiPixelTransient/interface/SiPixelTemplate.h b/CondFormats/SiPixelTransient/interface/SiPixelTemplate.h index 830d3e34f8830..a1ef44cfd58b7 100644 --- a/CondFormats/SiPixelTransient/interface/SiPixelTemplate.h +++ b/CondFormats/SiPixelTransient/interface/SiPixelTemplate.h @@ -206,20 +206,20 @@ struct SiPixelTemplateHeader { //!< template header structure struct SiPixelTemplateStore { //!< template storage structure SiPixelTemplateHeader head; #ifndef SI_PIXEL_TEMPLATE_USE_BOOST - float cotbetaY[60]; - float cotbetaX[60]; - float cotalphaX[60]; - //!< 60 Barrel y templates spanning cluster lengths from 0px to +18px [28 entries for fpix] - SiPixelTemplateEntry enty[60]; - //!< 29 Barrel x templates spanning cluster lengths from -6px (-1.125Rad) to +6px (+1.125Rad) in each of 5 slices [3x29 for fpix] - SiPixelTemplateEntry entx[60][60]; + float cotbetaY[TEMP_ENTRY_SIZEY]; + float cotbetaX[TEMP_ENTRY_SIZEX_B]; + float cotalphaX[TEMP_ENTRY_SIZEX_A]; + //!< 60 y templates spanning cluster lengths from 0px to +18px + SiPixelTemplateEntry enty[TEMP_ENTRY_SIZEY]; + //!< 60 Barrel x templates spanning cluster lengths from -6px (-1.125Rad) to +6px (+1.125Rad) in each of 60 slices + SiPixelTemplateEntry entx[TEMP_ENTRY_SIZEX_B][TEMP_ENTRY_SIZEX_A]; void destroy(){}; #else float* cotbetaY = nullptr; float* cotbetaX = nullptr; float* cotalphaX = nullptr; - boost::multi_array enty; //!< use 1d entry to store [60] barrel entries or [28] fpix entries - //!< use 2d entry to store [5][29] barrel entries or [3][29] fpix entries + boost::multi_array enty; //!< use 1d entry to store [60] entries + //!< use 2d entry to store [60][60] entries boost::multi_array entx; void destroy() { // deletes arrays created by pushfile method of SiPixelTemplate if (cotbetaY != nullptr) diff --git a/CondFormats/SiPixelTransient/interface/SiPixelTemplateDefs.h b/CondFormats/SiPixelTransient/interface/SiPixelTemplateDefs.h index f872959801eb7..8ca5b703d755c 100644 --- a/CondFormats/SiPixelTransient/interface/SiPixelTemplateDefs.h +++ b/CondFormats/SiPixelTransient/interface/SiPixelTemplateDefs.h @@ -40,5 +40,7 @@ #define T2HY 10 // = T2YSIZE/2 #define T2HYP1 T2HY + 1 // = T2YSIZE/2+1 #define T2HX 3 // = T2XSIZE/2 - +#define TEMP_ENTRY_SIZEX_A 60 +#define TEMP_ENTRY_SIZEX_B 60 +#define TEMP_ENTRY_SIZEY 60 #endif From a4ea534d3e1ccfa749d7527367de812c9fc2fba2 Mon Sep 17 00:00:00 2001 From: Cristina Date: Tue, 26 Nov 2019 11:41:12 -0600 Subject: [PATCH 8/8] code format check --- CondFormats/SiPixelTransient/interface/SiPixelGenError.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CondFormats/SiPixelTransient/interface/SiPixelGenError.h b/CondFormats/SiPixelTransient/interface/SiPixelGenError.h index d9c5fd4d8feed..6b68e1f0749a2 100644 --- a/CondFormats/SiPixelTransient/interface/SiPixelGenError.h +++ b/CondFormats/SiPixelTransient/interface/SiPixelGenError.h @@ -81,7 +81,7 @@ struct SiPixelGenErrorStore { //!< template storage structure float cotbetaY[TEMP_ENTRY_SIZEY]; float cotbetaX[TEMP_ENTRY_SIZEX_B]; float cotalphaX[TEMP_ENTRY_SIZEX_A]; - //!< 60 y templates spanning cluster lengths from 0px to +18px + //!< 60 y templates spanning cluster lengths from 0px to +18px SiPixelGenErrorEntry enty[TEMP_ENTRY_SIZEY]; //!< 60 x templates spanning cluster lengths from -6px (-1.125Rad) to +6px (+1.125Rad) in each of 60 slices SiPixelGenErrorEntry entx[TEMP_ENTRY_SIZEX_B][TEMP_ENTRY_SIZEX_A]; @@ -89,8 +89,8 @@ struct SiPixelGenErrorStore { //!< template storage structure float* cotbetaY; float* cotbetaX; float* cotalphaX; - boost::multi_array enty; //!< use 1d entry to store [60] entries - //!< use 2d entry to store [60][60] entries + boost::multi_array enty; //!< use 1d entry to store [60] entries + //!< use 2d entry to store [60][60] entries boost::multi_array entx; #endif };