From 36effde3d079aa92d804a8fe76af28138dd2226e Mon Sep 17 00:00:00 2001 From: Gaelle Date: Sun, 8 Feb 2015 18:07:40 +0100 Subject: [PATCH 1/2] Working up to Reco --- .../python/upgradeWorkflowComponents.py | 2 +- .../python/cmsExtendedGeometry2017XML_cfi.py | 10 +- .../Configuration/python/phase1TkCustoms.py | 84 +- .../PhaseI/PixelSkimmedGeometry_phase1.txt | 3712 ++++++++--------- .../Geometry/test/writeFile_phase1_cfg.py | 47 +- 5 files changed, 1929 insertions(+), 1926 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 03ffda33191c2..3b576137c2369 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -57,7 +57,7 @@ 'Extended2023HGCalMuon4Eta' : 'Extended2023HGCalMuon4Eta,Extended2023HGCalMuon4EtaReco', 'Extended2023HGCalV4' : 'Extended2023HGCalV4Muon,Extended2023HGCalV4MuonReco' } -upgradeGTs={ '2017' : 'auto:upgrade2017', +upgradeGTs={ '2017' : 'DESRUN2_74_V1', '2019' : 'auto:upgrade2019', '2019WithGEM' : 'auto:upgrade2019', '2017Aging' : 'W17_300_62E2::All', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py index 872b60160b8a8..b7e7296035f08 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py @@ -8,7 +8,6 @@ 'Geometry/CMSCommonData/data/extend/cmsextent.xml', 'Geometry/CMSCommonData/data/PhaseI/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', 'Geometry/CMSCommonData/data/caloBase.xml', 'Geometry/CMSCommonData/data/cmsCalo.xml', @@ -207,21 +206,18 @@ 'Geometry/EcalCommonData/data/eecon.xml', 'Geometry/EcalCommonData/data/eefixed.xml', 'Geometry/EcalCommonData/data/eehier.xml', - 'Geometry/EcalCommonData/data/ectkcable.xml', 'Geometry/EcalCommonData/data/eealgo.xml', 'Geometry/EcalCommonData/data/escon.xml', 'Geometry/EcalCommonData/data/esalgo.xml', 'Geometry/EcalCommonData/data/eeF.xml', 'Geometry/EcalCommonData/data/eeB.xml', 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/HcalCommonData/data/PhaseI/hcalalgo.xml', + 'Geometry/HcalCommonData/data/hcalalgo.xml', 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/PhaseI/hcalendcapalgo.xml', + 'Geometry/HcalCommonData/data/hcalendcapalgo.xml', 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/v1/mb1.xml', 'Geometry/MuonCommonData/data/v1/mb2.xml', @@ -254,7 +250,7 @@ 'Geometry/TrackerSimData/data/PhaseI/trackersens.xml', 'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml', 'Geometry/EcalSimData/data/ecalsens.xml', - 'Geometry/HcalCommonData/data/Phase0/hcalsenspmf.xml', + 'Geometry/HcalCommonData/data/hcalsenspmf.xml', 'Geometry/HcalSimData/data/hf.xml', 'Geometry/HcalSimData/data/hfpmt.xml', 'Geometry/HcalSimData/data/hffibrebundle.xml', diff --git a/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py index b98b99f70d025..93ad4022e1b4d 100644 --- a/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py +++ b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py @@ -28,7 +28,7 @@ def customise(process): if hasattr(process,'dqmHarvesting'): process=customise_harvesting(process) if hasattr(process,'validation_step'): - process=customise_Validation(process,float(n)) + process=customise_Validation(process) process=customise_condOverRides(process) return process @@ -69,16 +69,8 @@ def customise_Digi(process): # DQM steps change def customise_DQM(process,pileup): # We cut down the number of iterative tracking steps -# process.dqmoffline_step.remove(process.TrackMonStep3) -# process.dqmoffline_step.remove(process.TrackMonStep4) -# process.dqmoffline_step.remove(process.TrackMonStep5) -# process.dqmoffline_step.remove(process.TrackMonStep6) - # process.dqmoffline_step.remove(process.muonAnalyzer) process.dqmoffline_step.remove(process.jetMETAnalyzer) -# process.dqmoffline_step.remove(process.TrackMonStep9) -# process.dqmoffline_step.remove(process.TrackMonStep10) -# process.dqmoffline_step.remove(process.PixelTrackingRecHitsValid) #put isUpgrade flag==true process.SiPixelRawDataErrorSource.isUpgrade = cms.untracked.bool(True) @@ -97,43 +89,56 @@ def customise_DQM(process,pileup): process=customise_trackMon_IterativeTracking_PHASE1PU70(process) return process -def customise_Validation(process,pileup): +def customise_Validation(process): process.validation_step.remove(process.PixelTrackingRecHitsValid) # We don't run the HLT process.validation_step.remove(process.HLTSusyExoVal) process.validation_step.remove(process.hltHiggsValidator) process.validation_step.remove(process.relvalMuonBits) - if pileup>30: - process.trackValidator.label=cms.VInputTag(cms.InputTag("cutsRecoTracksHp")) - process.tracksValidationSelectors = cms.Sequence(process.cutsRecoTracksHp) - process.globalValidation.remove(process.recoMuonValidation) - process.validation.remove(process.recoMuonValidation) - process.validation_preprod.remove(process.recoMuonValidation) - process.validation_step.remove(process.recoMuonValidation) - process.validation.remove(process.globalrechitsanalyze) - process.validation_prod.remove(process.globalrechitsanalyze) - process.validation_step.remove(process.globalrechitsanalyze) - process.validation.remove(process.stripRecHitsValid) - process.validation_step.remove(process.stripRecHitsValid) - process.validation_step.remove(process.StripTrackingRecHitsValid) - process.globalValidation.remove(process.vertexValidation) - process.validation.remove(process.vertexValidation) - process.validation_step.remove(process.vertexValidation) - process.mix.input.nbPileupEvents.averageNumber = cms.double(0.0) - process.mix.minBunch = cms.int32(0) - process.mix.maxBunch = cms.int32(0) + return process +def customise_Validation_Trackingonly(process): + + #To allow Tracking to perform special tracking only validation + process.trackValidator.label=cms.VInputTag(cms.InputTag("cutsRecoTracksHp")) + process.tracksValidationSelectors = cms.Sequence(process.cutsRecoTracksHp) + process.globalValidation.remove(process.recoMuonValidation) + process.validation.remove(process.recoMuonValidation) + process.validation_preprod.remove(process.recoMuonValidation) + process.validation_step.remove(process.recoMuonValidation) + process.validation.remove(process.globalrechitsanalyze) + process.validation_prod.remove(process.globalrechitsanalyze) + process.validation_step.remove(process.globalrechitsanalyze) + process.validation.remove(process.stripRecHitsValid) + process.validation_step.remove(process.stripRecHitsValid) + process.validation_step.remove(process.StripTrackingRecHitsValid) + process.globalValidation.remove(process.vertexValidation) + process.validation.remove(process.vertexValidation) + process.validation_step.remove(process.vertexValidation) + process.mix.input.nbPileupEvents.averageNumber = cms.double(0.0) + process.mix.minBunch = cms.int32(0) + process.mix.maxBunch = cms.int32(0) return process def customise_harvesting(process): + process.dqmHarvesting.remove(process.jetMETDQMOfflineClient) process.dqmHarvesting.remove(process.dataCertificationJetMET) - ###process.dqmHarvesting.remove(process.sipixelEDAClient) + #######process.dqmHarvesting.remove(process.sipixelEDAClient) process.sipixelEDAClient.isUpgrade = cms.untracked.bool(True) process.dqmHarvesting.remove(process.sipixelCertification) return (process) def customise_condOverRides(process): -# process.load('SLHCUpgradeSimulations.Geometry.fakeConditions_Phase1_R30F12_cff') +# process.trackerTopologyConstants.pxb_layerStartBit = cms.uint32(20) +# process.trackerTopologyConstants.pxb_ladderStartBit = cms.uint32(12) +# process.trackerTopologyConstants.pxb_moduleStartBit = cms.uint32(2) +# process.trackerTopologyConstants.pxb_layerMask = cms.uint32(15) +# process.trackerTopologyConstants.pxb_ladderMask = cms.uint32(255) +# process.trackerTopologyConstants.pxb_moduleMask = cms.uint32(1023) +# process.trackerTopologyConstants.pxf_diskStartBit = cms.uint32(18) +# process.trackerTopologyConstants.pxf_bladeStartBit = cms.uint32(12) +# process.trackerTopologyConstants.pxf_panelStartBit = cms.uint32(10) +# process.trackerTopologyConstants.pxf_moduleMask = cms.uint32(255) return process def add_detailed_pixel_dqm(process): @@ -167,7 +172,7 @@ def customise_Reco(process,pileup): process.MeasurementTracker.inactivePixelDetectorLabels = cms.VInputTag() # new layer list (3/4 pixel seeding) in InitialStep and pixelTracks - process.PixelLayerTriplets.layerList = cms.vstring( 'BPix1+BPix2+BPix3', + process.pixellayertriplets.layerList = cms.vstring( 'BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4', 'BPix1+BPix3+BPix4', 'BPix1+BPix2+BPix4', @@ -222,16 +227,15 @@ def customise_Reco(process,pileup): process.reconstruction.remove(process.castorreco) process.reconstruction.remove(process.CastorTowerReco) - process.reconstruction.remove(process.ak7CastorJets) + process.reconstruction.remove(process.ak7BasicJets) process.reconstruction.remove(process.ak7CastorJetID) #the quadruplet merger configuration - # from this PSet the quadruplet merger uses only the layer list so these could probably be removed - from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import PixelSeedMergerQuadruplets - PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" ) - PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" ) - PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" ) - PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" ) + process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff") + process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" ) + process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" ) + process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" ) + process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" ) # Need these until pixel templates are used process.load("SLHCUpgradeSimulations.Geometry.recoFromSimDigis_cff") @@ -257,7 +261,7 @@ def customise_Reco(process,pileup): # Make pixelTracks use quadruplets process.pixelTracks.SeedMergerPSet = cms.PSet( - layerList = PixelSeedMergerQuadruplets, + layerListName = cms.string('PixelSeedMergerQuadruplets'), addRemainingTriplets = cms.bool(False), mergeTriplets = cms.bool(True), ttrhBuilderLabel = cms.string('PixelTTRHBuilderWithoutAngle') diff --git a/SLHCUpgradeSimulations/Geometry/data/PhaseI/PixelSkimmedGeometry_phase1.txt b/SLHCUpgradeSimulations/Geometry/data/PhaseI/PixelSkimmedGeometry_phase1.txt index 1c66c98c2bf6f..f025d8396014e 100644 --- a/SLHCUpgradeSimulations/Geometry/data/PhaseI/PixelSkimmedGeometry_phase1.txt +++ b/SLHCUpgradeSimulations/Geometry/data/PhaseI/PixelSkimmedGeometry_phase1.txt @@ -1,1856 +1,1856 @@ -302252292 416 160 -302252296 416 160 -302252300 416 160 -302252304 416 160 -302252308 416 160 -302252312 416 160 -302252316 416 160 -302252320 416 160 -302252548 416 160 -302252552 416 160 -302252556 416 160 -302252560 416 160 -302252564 416 160 -302252568 416 160 -302252572 416 160 -302252576 416 160 -302252804 416 160 -302252808 416 160 -302252812 416 160 -302252816 416 160 -302252820 416 160 -302252824 416 160 -302252828 416 160 -302252832 416 160 -302253060 416 160 -302253064 416 160 -302253068 416 160 -302253072 416 160 -302253076 416 160 -302253080 416 160 -302253084 416 160 -302253088 416 160 -302253316 416 160 -302253320 416 160 -302253324 416 160 -302253328 416 160 -302253332 416 160 -302253336 416 160 -302253340 416 160 -302253344 416 160 -302253572 416 160 -302253576 416 160 -302253580 416 160 -302253584 416 160 -302253588 416 160 -302253592 416 160 -302253596 416 160 -302253600 416 160 -302253828 416 160 -302253832 416 160 -302253836 416 160 -302253840 416 160 -302253844 416 160 -302253848 416 160 -302253852 416 160 -302253856 416 160 -302254084 416 160 -302254088 416 160 -302254092 416 160 -302254096 416 160 -302254100 416 160 -302254104 416 160 -302254108 416 160 -302254112 416 160 -302254340 416 160 -302254344 416 160 -302254348 416 160 -302254352 416 160 -302254356 416 160 -302254360 416 160 -302254364 416 160 -302254368 416 160 -302254596 416 160 -302254600 416 160 -302254604 416 160 -302254608 416 160 -302254612 416 160 -302254616 416 160 -302254620 416 160 -302254624 416 160 -302254852 416 160 -302254856 416 160 -302254860 416 160 -302254864 416 160 -302254868 416 160 -302254872 416 160 -302254876 416 160 -302254880 416 160 -302255108 416 160 -302255112 416 160 -302255116 416 160 -302255120 416 160 -302255124 416 160 -302255128 416 160 -302255132 416 160 -302255136 416 160 -302514436 416 160 -302514440 416 160 -302514444 416 160 -302514448 416 160 -302514452 416 160 -302514456 416 160 -302514460 416 160 -302514464 416 160 -302514692 416 160 -302514696 416 160 -302514700 416 160 -302514704 416 160 -302514708 416 160 -302514712 416 160 -302514716 416 160 -302514720 416 160 -302514948 416 160 -302514952 416 160 -302514956 416 160 -302514960 416 160 -302514964 416 160 -302514968 416 160 -302514972 416 160 -302514976 416 160 -302515204 416 160 -302515208 416 160 -302515212 416 160 -302515216 416 160 -302515220 416 160 -302515224 416 160 -302515228 416 160 -302515232 416 160 -302515460 416 160 -302515464 416 160 -302515468 416 160 -302515472 416 160 -302515476 416 160 -302515480 416 160 -302515484 416 160 -302515488 416 160 -302515716 416 160 -302515720 416 160 -302515724 416 160 -302515728 416 160 -302515732 416 160 -302515736 416 160 -302515740 416 160 -302515744 416 160 -302515972 416 160 -302515976 416 160 -302515980 416 160 -302515984 416 160 -302515988 416 160 -302515992 416 160 -302515996 416 160 -302516000 416 160 -302516228 416 160 -302516232 416 160 -302516236 416 160 -302516240 416 160 -302516244 416 160 -302516248 416 160 -302516252 416 160 -302516256 416 160 -302516484 416 160 -302516488 416 160 -302516492 416 160 -302516496 416 160 -302516500 416 160 -302516504 416 160 -302516508 416 160 -302516512 416 160 -302516740 416 160 -302516744 416 160 -302516748 416 160 -302516752 416 160 -302516756 416 160 -302516760 416 160 -302516764 416 160 -302516768 416 160 -302516996 416 160 -302517000 416 160 -302517004 416 160 -302517008 416 160 -302517012 416 160 -302517016 416 160 -302517020 416 160 -302517024 416 160 -302517252 416 160 -302517256 416 160 -302517260 416 160 -302517264 416 160 -302517268 416 160 -302517272 416 160 -302517276 416 160 -302517280 416 160 -302517508 416 160 -302517512 416 160 -302517516 416 160 -302517520 416 160 -302517524 416 160 -302517528 416 160 -302517532 416 160 -302517536 416 160 -302517764 416 160 -302517768 416 160 -302517772 416 160 -302517776 416 160 -302517780 416 160 -302517784 416 160 -302517788 416 160 -302517792 416 160 -302518020 416 160 -302518024 416 160 -302518028 416 160 -302518032 416 160 -302518036 416 160 -302518040 416 160 -302518044 416 160 -302518048 416 160 -302518276 416 160 -302518280 416 160 -302518284 416 160 -302518288 416 160 -302518292 416 160 -302518296 416 160 -302518300 416 160 -302518304 416 160 -302518532 416 160 -302518536 416 160 -302518540 416 160 -302518544 416 160 -302518548 416 160 -302518552 416 160 -302518556 416 160 -302518560 416 160 -302518788 416 160 -302518792 416 160 -302518796 416 160 -302518800 416 160 -302518804 416 160 -302518808 416 160 -302518812 416 160 -302518816 416 160 -302519044 416 160 -302519048 416 160 -302519052 416 160 -302519056 416 160 -302519060 416 160 -302519064 416 160 -302519068 416 160 -302519072 416 160 -302519300 416 160 -302519304 416 160 -302519308 416 160 -302519312 416 160 -302519316 416 160 -302519320 416 160 -302519324 416 160 -302519328 416 160 -302519556 416 160 -302519560 416 160 -302519564 416 160 -302519568 416 160 -302519572 416 160 -302519576 416 160 -302519580 416 160 -302519584 416 160 -302519812 416 160 -302519816 416 160 -302519820 416 160 -302519824 416 160 -302519828 416 160 -302519832 416 160 -302519836 416 160 -302519840 416 160 -302520068 416 160 -302520072 416 160 -302520076 416 160 -302520080 416 160 -302520084 416 160 -302520088 416 160 -302520092 416 160 -302520096 416 160 -302520324 416 160 -302520328 416 160 -302520332 416 160 -302520336 416 160 -302520340 416 160 -302520344 416 160 -302520348 416 160 -302520352 416 160 -302520580 416 160 -302520584 416 160 -302520588 416 160 -302520592 416 160 -302520596 416 160 -302520600 416 160 -302520604 416 160 -302520608 416 160 -302520836 416 160 -302520840 416 160 -302520844 416 160 -302520848 416 160 -302520852 416 160 -302520856 416 160 -302520860 416 160 -302520864 416 160 -302521092 416 160 -302521096 416 160 -302521100 416 160 -302521104 416 160 -302521108 416 160 -302521112 416 160 -302521116 416 160 -302521120 416 160 -302521348 416 160 -302521352 416 160 -302521356 416 160 -302521360 416 160 -302521364 416 160 -302521368 416 160 -302521372 416 160 -302521376 416 160 -302776580 416 160 -302776584 416 160 -302776588 416 160 -302776592 416 160 -302776596 416 160 -302776600 416 160 -302776604 416 160 -302776608 416 160 -302776836 416 160 -302776840 416 160 -302776844 416 160 -302776848 416 160 -302776852 416 160 -302776856 416 160 -302776860 416 160 -302776864 416 160 -302777092 416 160 -302777096 416 160 -302777100 416 160 -302777104 416 160 -302777108 416 160 -302777112 416 160 -302777116 416 160 -302777120 416 160 -302777348 416 160 -302777352 416 160 -302777356 416 160 -302777360 416 160 -302777364 416 160 -302777368 416 160 -302777372 416 160 -302777376 416 160 -302777604 416 160 -302777608 416 160 -302777612 416 160 -302777616 416 160 -302777620 416 160 -302777624 416 160 -302777628 416 160 -302777632 416 160 -302777860 416 160 -302777864 416 160 -302777868 416 160 -302777872 416 160 -302777876 416 160 -302777880 416 160 -302777884 416 160 -302777888 416 160 -302778116 416 160 -302778120 416 160 -302778124 416 160 -302778128 416 160 -302778132 416 160 -302778136 416 160 -302778140 416 160 -302778144 416 160 -302778372 416 160 -302778376 416 160 -302778380 416 160 -302778384 416 160 -302778388 416 160 -302778392 416 160 -302778396 416 160 -302778400 416 160 -302778628 416 160 -302778632 416 160 -302778636 416 160 -302778640 416 160 -302778644 416 160 -302778648 416 160 -302778652 416 160 -302778656 416 160 -302778884 416 160 -302778888 416 160 -302778892 416 160 -302778896 416 160 -302778900 416 160 -302778904 416 160 -302778908 416 160 -302778912 416 160 -302779140 416 160 -302779144 416 160 -302779148 416 160 -302779152 416 160 -302779156 416 160 -302779160 416 160 -302779164 416 160 -302779168 416 160 -302779396 416 160 -302779400 416 160 -302779404 416 160 -302779408 416 160 -302779412 416 160 -302779416 416 160 -302779420 416 160 -302779424 416 160 -302779652 416 160 -302779656 416 160 -302779660 416 160 -302779664 416 160 -302779668 416 160 -302779672 416 160 -302779676 416 160 -302779680 416 160 -302779908 416 160 -302779912 416 160 -302779916 416 160 -302779920 416 160 -302779924 416 160 -302779928 416 160 -302779932 416 160 -302779936 416 160 -302780164 416 160 -302780168 416 160 -302780172 416 160 -302780176 416 160 -302780180 416 160 -302780184 416 160 -302780188 416 160 -302780192 416 160 -302780420 416 160 -302780424 416 160 -302780428 416 160 -302780432 416 160 -302780436 416 160 -302780440 416 160 -302780444 416 160 -302780448 416 160 -302780676 416 160 -302780680 416 160 -302780684 416 160 -302780688 416 160 -302780692 416 160 -302780696 416 160 -302780700 416 160 -302780704 416 160 -302780932 416 160 -302780936 416 160 -302780940 416 160 -302780944 416 160 -302780948 416 160 -302780952 416 160 -302780956 416 160 -302780960 416 160 -302781188 416 160 -302781192 416 160 -302781196 416 160 -302781200 416 160 -302781204 416 160 -302781208 416 160 -302781212 416 160 -302781216 416 160 -302781444 416 160 -302781448 416 160 -302781452 416 160 -302781456 416 160 -302781460 416 160 -302781464 416 160 -302781468 416 160 -302781472 416 160 -302781700 416 160 -302781704 416 160 -302781708 416 160 -302781712 416 160 -302781716 416 160 -302781720 416 160 -302781724 416 160 -302781728 416 160 -302781956 416 160 -302781960 416 160 -302781964 416 160 -302781968 416 160 -302781972 416 160 -302781976 416 160 -302781980 416 160 -302781984 416 160 -302782212 416 160 -302782216 416 160 -302782220 416 160 -302782224 416 160 -302782228 416 160 -302782232 416 160 -302782236 416 160 -302782240 416 160 -302782468 416 160 -302782472 416 160 -302782476 416 160 -302782480 416 160 -302782484 416 160 -302782488 416 160 -302782492 416 160 -302782496 416 160 -302782724 416 160 -302782728 416 160 -302782732 416 160 -302782736 416 160 -302782740 416 160 -302782744 416 160 -302782748 416 160 -302782752 416 160 -302782980 416 160 -302782984 416 160 -302782988 416 160 -302782992 416 160 -302782996 416 160 -302783000 416 160 -302783004 416 160 -302783008 416 160 -302783236 416 160 -302783240 416 160 -302783244 416 160 -302783248 416 160 -302783252 416 160 -302783256 416 160 -302783260 416 160 -302783264 416 160 -302783492 416 160 -302783496 416 160 -302783500 416 160 -302783504 416 160 -302783508 416 160 -302783512 416 160 -302783516 416 160 -302783520 416 160 -302783748 416 160 -302783752 416 160 -302783756 416 160 -302783760 416 160 -302783764 416 160 -302783768 416 160 -302783772 416 160 -302783776 416 160 -302784004 416 160 -302784008 416 160 -302784012 416 160 -302784016 416 160 -302784020 416 160 -302784024 416 160 -302784028 416 160 -302784032 416 160 -302784260 416 160 -302784264 416 160 -302784268 416 160 -302784272 416 160 -302784276 416 160 -302784280 416 160 -302784284 416 160 -302784288 416 160 -302784516 416 160 -302784520 416 160 -302784524 416 160 -302784528 416 160 -302784532 416 160 -302784536 416 160 -302784540 416 160 -302784544 416 160 -302784772 416 160 -302784776 416 160 -302784780 416 160 -302784784 416 160 -302784788 416 160 -302784792 416 160 -302784796 416 160 -302784800 416 160 -302785028 416 160 -302785032 416 160 -302785036 416 160 -302785040 416 160 -302785044 416 160 -302785048 416 160 -302785052 416 160 -302785056 416 160 -302785284 416 160 -302785288 416 160 -302785292 416 160 -302785296 416 160 -302785300 416 160 -302785304 416 160 -302785308 416 160 -302785312 416 160 -302785540 416 160 -302785544 416 160 -302785548 416 160 -302785552 416 160 -302785556 416 160 -302785560 416 160 -302785564 416 160 -302785568 416 160 -302785796 416 160 -302785800 416 160 -302785804 416 160 -302785808 416 160 -302785812 416 160 -302785816 416 160 -302785820 416 160 -302785824 416 160 -302786052 416 160 -302786056 416 160 -302786060 416 160 -302786064 416 160 -302786068 416 160 -302786072 416 160 -302786076 416 160 -302786080 416 160 -302786308 416 160 -302786312 416 160 -302786316 416 160 -302786320 416 160 -302786324 416 160 -302786328 416 160 -302786332 416 160 -302786336 416 160 -302786564 416 160 -302786568 416 160 -302786572 416 160 -302786576 416 160 -302786580 416 160 -302786584 416 160 -302786588 416 160 -302786592 416 160 -302786820 416 160 -302786824 416 160 -302786828 416 160 -302786832 416 160 -302786836 416 160 -302786840 416 160 -302786844 416 160 -302786848 416 160 -302787076 416 160 -302787080 416 160 -302787084 416 160 -302787088 416 160 -302787092 416 160 -302787096 416 160 -302787100 416 160 -302787104 416 160 -302787332 416 160 -302787336 416 160 -302787340 416 160 -302787344 416 160 -302787348 416 160 -302787352 416 160 -302787356 416 160 -302787360 416 160 -302787588 416 160 -302787592 416 160 -302787596 416 160 -302787600 416 160 -302787604 416 160 -302787608 416 160 -302787612 416 160 -302787616 416 160 -303038724 416 160 -303038728 416 160 -303038732 416 160 -303038736 416 160 -303038740 416 160 -303038744 416 160 -303038748 416 160 -303038752 416 160 -303038980 416 160 -303038984 416 160 -303038988 416 160 -303038992 416 160 -303038996 416 160 -303039000 416 160 -303039004 416 160 -303039008 416 160 -303039236 416 160 -303039240 416 160 -303039244 416 160 -303039248 416 160 -303039252 416 160 -303039256 416 160 -303039260 416 160 -303039264 416 160 -303039492 416 160 -303039496 416 160 -303039500 416 160 -303039504 416 160 -303039508 416 160 -303039512 416 160 -303039516 416 160 -303039520 416 160 -303039748 416 160 -303039752 416 160 -303039756 416 160 -303039760 416 160 -303039764 416 160 -303039768 416 160 -303039772 416 160 -303039776 416 160 -303040004 416 160 -303040008 416 160 -303040012 416 160 -303040016 416 160 -303040020 416 160 -303040024 416 160 -303040028 416 160 -303040032 416 160 -303040260 416 160 -303040264 416 160 -303040268 416 160 -303040272 416 160 -303040276 416 160 -303040280 416 160 -303040284 416 160 -303040288 416 160 -303040516 416 160 -303040520 416 160 -303040524 416 160 -303040528 416 160 -303040532 416 160 -303040536 416 160 -303040540 416 160 -303040544 416 160 -303040772 416 160 -303040776 416 160 -303040780 416 160 -303040784 416 160 -303040788 416 160 -303040792 416 160 -303040796 416 160 -303040800 416 160 -303041028 416 160 -303041032 416 160 -303041036 416 160 -303041040 416 160 -303041044 416 160 -303041048 416 160 -303041052 416 160 -303041056 416 160 -303041284 416 160 -303041288 416 160 -303041292 416 160 -303041296 416 160 -303041300 416 160 -303041304 416 160 -303041308 416 160 -303041312 416 160 -303041540 416 160 -303041544 416 160 -303041548 416 160 -303041552 416 160 -303041556 416 160 -303041560 416 160 -303041564 416 160 -303041568 416 160 -303041796 416 160 -303041800 416 160 -303041804 416 160 -303041808 416 160 -303041812 416 160 -303041816 416 160 -303041820 416 160 -303041824 416 160 -303042052 416 160 -303042056 416 160 -303042060 416 160 -303042064 416 160 -303042068 416 160 -303042072 416 160 -303042076 416 160 -303042080 416 160 -303042308 416 160 -303042312 416 160 -303042316 416 160 -303042320 416 160 -303042324 416 160 -303042328 416 160 -303042332 416 160 -303042336 416 160 -303042564 416 160 -303042568 416 160 -303042572 416 160 -303042576 416 160 -303042580 416 160 -303042584 416 160 -303042588 416 160 -303042592 416 160 -303042820 416 160 -303042824 416 160 -303042828 416 160 -303042832 416 160 -303042836 416 160 -303042840 416 160 -303042844 416 160 -303042848 416 160 -303043076 416 160 -303043080 416 160 -303043084 416 160 -303043088 416 160 -303043092 416 160 -303043096 416 160 -303043100 416 160 -303043104 416 160 -303043332 416 160 -303043336 416 160 -303043340 416 160 -303043344 416 160 -303043348 416 160 -303043352 416 160 -303043356 416 160 -303043360 416 160 -303043588 416 160 -303043592 416 160 -303043596 416 160 -303043600 416 160 -303043604 416 160 -303043608 416 160 -303043612 416 160 -303043616 416 160 -303043844 416 160 -303043848 416 160 -303043852 416 160 -303043856 416 160 -303043860 416 160 -303043864 416 160 -303043868 416 160 -303043872 416 160 -303044100 416 160 -303044104 416 160 -303044108 416 160 -303044112 416 160 -303044116 416 160 -303044120 416 160 -303044124 416 160 -303044128 416 160 -303044356 416 160 -303044360 416 160 -303044364 416 160 -303044368 416 160 -303044372 416 160 -303044376 416 160 -303044380 416 160 -303044384 416 160 -303044612 416 160 -303044616 416 160 -303044620 416 160 -303044624 416 160 -303044628 416 160 -303044632 416 160 -303044636 416 160 -303044640 416 160 -303044868 416 160 -303044872 416 160 -303044876 416 160 -303044880 416 160 -303044884 416 160 -303044888 416 160 -303044892 416 160 -303044896 416 160 -303045124 416 160 -303045128 416 160 -303045132 416 160 -303045136 416 160 -303045140 416 160 -303045144 416 160 -303045148 416 160 -303045152 416 160 -303045380 416 160 -303045384 416 160 -303045388 416 160 -303045392 416 160 -303045396 416 160 -303045400 416 160 -303045404 416 160 -303045408 416 160 -303045636 416 160 -303045640 416 160 -303045644 416 160 -303045648 416 160 -303045652 416 160 -303045656 416 160 -303045660 416 160 -303045664 416 160 -303045892 416 160 -303045896 416 160 -303045900 416 160 -303045904 416 160 -303045908 416 160 -303045912 416 160 -303045916 416 160 -303045920 416 160 -303046148 416 160 -303046152 416 160 -303046156 416 160 -303046160 416 160 -303046164 416 160 -303046168 416 160 -303046172 416 160 -303046176 416 160 -303046404 416 160 -303046408 416 160 -303046412 416 160 -303046416 416 160 -303046420 416 160 -303046424 416 160 -303046428 416 160 -303046432 416 160 -303046660 416 160 -303046664 416 160 -303046668 416 160 -303046672 416 160 -303046676 416 160 -303046680 416 160 -303046684 416 160 -303046688 416 160 -303046916 416 160 -303046920 416 160 -303046924 416 160 -303046928 416 160 -303046932 416 160 -303046936 416 160 -303046940 416 160 -303046944 416 160 -303047172 416 160 -303047176 416 160 -303047180 416 160 -303047184 416 160 -303047188 416 160 -303047192 416 160 -303047196 416 160 -303047200 416 160 -303047428 416 160 -303047432 416 160 -303047436 416 160 -303047440 416 160 -303047444 416 160 -303047448 416 160 -303047452 416 160 -303047456 416 160 -303047684 416 160 -303047688 416 160 -303047692 416 160 -303047696 416 160 -303047700 416 160 -303047704 416 160 -303047708 416 160 -303047712 416 160 -303047940 416 160 -303047944 416 160 -303047948 416 160 -303047952 416 160 -303047956 416 160 -303047960 416 160 -303047964 416 160 -303047968 416 160 -303048196 416 160 -303048200 416 160 -303048204 416 160 -303048208 416 160 -303048212 416 160 -303048216 416 160 -303048220 416 160 -303048224 416 160 -303048452 416 160 -303048456 416 160 -303048460 416 160 -303048464 416 160 -303048468 416 160 -303048472 416 160 -303048476 416 160 -303048480 416 160 -303048708 416 160 -303048712 416 160 -303048716 416 160 -303048720 416 160 -303048724 416 160 -303048728 416 160 -303048732 416 160 -303048736 416 160 -303048964 416 160 -303048968 416 160 -303048972 416 160 -303048976 416 160 -303048980 416 160 -303048984 416 160 -303048988 416 160 -303048992 416 160 -303049220 416 160 -303049224 416 160 -303049228 416 160 -303049232 416 160 -303049236 416 160 -303049240 416 160 -303049244 416 160 -303049248 416 160 -303049476 416 160 -303049480 416 160 -303049484 416 160 -303049488 416 160 -303049492 416 160 -303049496 416 160 -303049500 416 160 -303049504 416 160 -303049732 416 160 -303049736 416 160 -303049740 416 160 -303049744 416 160 -303049748 416 160 -303049752 416 160 -303049756 416 160 -303049760 416 160 -303049988 416 160 -303049992 416 160 -303049996 416 160 -303050000 416 160 -303050004 416 160 -303050008 416 160 -303050012 416 160 -303050016 416 160 -303050244 416 160 -303050248 416 160 -303050252 416 160 -303050256 416 160 -303050260 416 160 -303050264 416 160 -303050268 416 160 -303050272 416 160 -303050500 416 160 -303050504 416 160 -303050508 416 160 -303050512 416 160 -303050516 416 160 -303050520 416 160 -303050524 416 160 -303050528 416 160 -303050756 416 160 -303050760 416 160 -303050764 416 160 -303050768 416 160 -303050772 416 160 -303050776 416 160 -303050780 416 160 -303050784 416 160 -303051012 416 160 -303051016 416 160 -303051020 416 160 -303051024 416 160 -303051028 416 160 -303051032 416 160 -303051036 416 160 -303051040 416 160 -303051268 416 160 -303051272 416 160 -303051276 416 160 -303051280 416 160 -303051284 416 160 -303051288 416 160 -303051292 416 160 -303051296 416 160 -303051524 416 160 -303051528 416 160 -303051532 416 160 -303051536 416 160 -303051540 416 160 -303051544 416 160 -303051548 416 160 -303051552 416 160 -303051780 416 160 -303051784 416 160 -303051788 416 160 -303051792 416 160 -303051796 416 160 -303051800 416 160 -303051804 416 160 -303051808 416 160 -303052036 416 160 -303052040 416 160 -303052044 416 160 -303052048 416 160 -303052052 416 160 -303052056 416 160 -303052060 416 160 -303052064 416 160 -303052292 416 160 -303052296 416 160 -303052300 416 160 -303052304 416 160 -303052308 416 160 -303052312 416 160 -303052316 416 160 -303052320 416 160 -303052548 416 160 -303052552 416 160 -303052556 416 160 -303052560 416 160 -303052564 416 160 -303052568 416 160 -303052572 416 160 -303052576 416 160 -303052804 416 160 -303052808 416 160 -303052812 416 160 -303052816 416 160 -303052820 416 160 -303052824 416 160 -303052828 416 160 -303052832 416 160 -303053060 416 160 -303053064 416 160 -303053068 416 160 -303053072 416 160 -303053076 416 160 -303053080 416 160 -303053084 416 160 -303053088 416 160 -303053316 416 160 -303053320 416 160 -303053324 416 160 -303053328 416 160 -303053332 416 160 -303053336 416 160 -303053340 416 160 -303053344 416 160 -303053572 416 160 -303053576 416 160 -303053580 416 160 -303053584 416 160 -303053588 416 160 -303053592 416 160 -303053596 416 160 -303053600 416 160 -303053828 416 160 -303053832 416 160 -303053836 416 160 -303053840 416 160 -303053844 416 160 -303053848 416 160 -303053852 416 160 -303053856 416 160 -303054084 416 160 -303054088 416 160 -303054092 416 160 -303054096 416 160 -303054100 416 160 -303054104 416 160 -303054108 416 160 -303054112 416 160 -303054340 416 160 -303054344 416 160 -303054348 416 160 -303054352 416 160 -303054356 416 160 -303054360 416 160 -303054364 416 160 -303054368 416 160 -303054596 416 160 -303054600 416 160 -303054604 416 160 -303054608 416 160 -303054612 416 160 -303054616 416 160 -303054620 416 160 -303054624 416 160 -303054852 416 160 -303054856 416 160 -303054860 416 160 -303054864 416 160 -303054868 416 160 -303054872 416 160 -303054876 416 160 -303054880 416 160 -352388356 416 160 -352389380 416 160 -352390404 416 160 -352391428 416 160 -352392452 416 160 -352393476 416 160 -352394500 416 160 -352395524 416 160 -352396548 416 160 -352397572 416 160 -352398596 416 160 -352399620 416 160 -352400644 416 160 -352401668 416 160 -352402692 416 160 -352403716 416 160 -352404740 416 160 -352405764 416 160 -352406788 416 160 -352407812 416 160 -352408836 416 160 -352409860 416 160 -352410884 416 160 -352411908 416 160 -352412932 416 160 -352413956 416 160 -352414980 416 160 -352416004 416 160 -352417028 416 160 -352418052 416 160 -352419076 416 160 -352420100 416 160 -352421124 416 160 -352422148 416 160 -352423172 416 160 -352424196 416 160 -352425220 416 160 -352426244 416 160 -352427268 416 160 -352428292 416 160 -352429316 416 160 -352430340 416 160 -352431364 416 160 -352432388 416 160 -352433412 416 160 -352434436 416 160 -352435460 416 160 -352436484 416 160 -352437508 416 160 -352438532 416 160 -352439556 416 160 -352440580 416 160 -352441604 416 160 -352442628 416 160 -352443652 416 160 -352444676 416 160 -352388612 416 160 -352389636 416 160 -352390660 416 160 -352391684 416 160 -352392708 416 160 -352393732 416 160 -352394756 416 160 -352395780 416 160 -352396804 416 160 -352397828 416 160 -352398852 416 160 -352399876 416 160 -352400900 416 160 -352401924 416 160 -352402948 416 160 -352403972 416 160 -352404996 416 160 -352406020 416 160 -352407044 416 160 -352408068 416 160 -352409092 416 160 -352410116 416 160 -352411140 416 160 -352412164 416 160 -352413188 416 160 -352414212 416 160 -352415236 416 160 -352416260 416 160 -352417284 416 160 -352418308 416 160 -352419332 416 160 -352420356 416 160 -352421380 416 160 -352422404 416 160 -352423428 416 160 -352424452 416 160 -352425476 416 160 -352426500 416 160 -352427524 416 160 -352428548 416 160 -352429572 416 160 -352430596 416 160 -352431620 416 160 -352432644 416 160 -352433668 416 160 -352434692 416 160 -352435716 416 160 -352436740 416 160 -352437764 416 160 -352438788 416 160 -352439812 416 160 -352440836 416 160 -352441860 416 160 -352442884 416 160 -352443908 416 160 -352444932 416 160 -352453892 416 160 -352454916 416 160 -352455940 416 160 -352456964 416 160 -352457988 416 160 -352459012 416 160 -352460036 416 160 -352461060 416 160 -352462084 416 160 -352463108 416 160 -352464132 416 160 -352465156 416 160 -352466180 416 160 -352467204 416 160 -352468228 416 160 -352469252 416 160 -352470276 416 160 -352471300 416 160 -352472324 416 160 -352473348 416 160 -352474372 416 160 -352475396 416 160 -352476420 416 160 -352477444 416 160 -352478468 416 160 -352479492 416 160 -352480516 416 160 -352481540 416 160 -352482564 416 160 -352483588 416 160 -352484612 416 160 -352485636 416 160 -352486660 416 160 -352487684 416 160 -352488708 416 160 -352489732 416 160 -352490756 416 160 -352491780 416 160 -352492804 416 160 -352493828 416 160 -352494852 416 160 -352495876 416 160 -352496900 416 160 -352497924 416 160 -352498948 416 160 -352499972 416 160 -352500996 416 160 -352502020 416 160 -352503044 416 160 -352504068 416 160 -352505092 416 160 -352506116 416 160 -352507140 416 160 -352508164 416 160 -352509188 416 160 -352510212 416 160 -352454148 416 160 -352455172 416 160 -352456196 416 160 -352457220 416 160 -352458244 416 160 -352459268 416 160 -352460292 416 160 -352461316 416 160 -352462340 416 160 -352463364 416 160 -352464388 416 160 -352465412 416 160 -352466436 416 160 -352467460 416 160 -352468484 416 160 -352469508 416 160 -352470532 416 160 -352471556 416 160 -352472580 416 160 -352473604 416 160 -352474628 416 160 -352475652 416 160 -352476676 416 160 -352477700 416 160 -352478724 416 160 -352479748 416 160 -352480772 416 160 -352481796 416 160 -352482820 416 160 -352483844 416 160 -352484868 416 160 -352485892 416 160 -352486916 416 160 -352487940 416 160 -352488964 416 160 -352489988 416 160 -352491012 416 160 -352492036 416 160 -352493060 416 160 -352494084 416 160 -352495108 416 160 -352496132 416 160 -352497156 416 160 -352498180 416 160 -352499204 416 160 -352500228 416 160 -352501252 416 160 -352502276 416 160 -352503300 416 160 -352504324 416 160 -352505348 416 160 -352506372 416 160 -352507396 416 160 -352508420 416 160 -352509444 416 160 -352510468 416 160 -352519428 416 160 -352520452 416 160 -352521476 416 160 -352522500 416 160 -352523524 416 160 -352524548 416 160 -352525572 416 160 -352526596 416 160 -352527620 416 160 -352528644 416 160 -352529668 416 160 -352530692 416 160 -352531716 416 160 -352532740 416 160 -352533764 416 160 -352534788 416 160 -352535812 416 160 -352536836 416 160 -352537860 416 160 -352538884 416 160 -352539908 416 160 -352540932 416 160 -352541956 416 160 -352542980 416 160 -352544004 416 160 -352545028 416 160 -352546052 416 160 -352547076 416 160 -352548100 416 160 -352549124 416 160 -352550148 416 160 -352551172 416 160 -352552196 416 160 -352553220 416 160 -352554244 416 160 -352555268 416 160 -352556292 416 160 -352557316 416 160 -352558340 416 160 -352559364 416 160 -352560388 416 160 -352561412 416 160 -352562436 416 160 -352563460 416 160 -352564484 416 160 -352565508 416 160 -352566532 416 160 -352567556 416 160 -352568580 416 160 -352569604 416 160 -352570628 416 160 -352571652 416 160 -352572676 416 160 -352573700 416 160 -352574724 416 160 -352575748 416 160 -352519684 416 160 -352520708 416 160 -352521732 416 160 -352522756 416 160 -352523780 416 160 -352524804 416 160 -352525828 416 160 -352526852 416 160 -352527876 416 160 -352528900 416 160 -352529924 416 160 -352530948 416 160 -352531972 416 160 -352532996 416 160 -352534020 416 160 -352535044 416 160 -352536068 416 160 -352537092 416 160 -352538116 416 160 -352539140 416 160 -352540164 416 160 -352541188 416 160 -352542212 416 160 -352543236 416 160 -352544260 416 160 -352545284 416 160 -352546308 416 160 -352547332 416 160 -352548356 416 160 -352549380 416 160 -352550404 416 160 -352551428 416 160 -352552452 416 160 -352553476 416 160 -352554500 416 160 -352555524 416 160 -352556548 416 160 -352557572 416 160 -352558596 416 160 -352559620 416 160 -352560644 416 160 -352561668 416 160 -352562692 416 160 -352563716 416 160 -352564740 416 160 -352565764 416 160 -352566788 416 160 -352567812 416 160 -352568836 416 160 -352569860 416 160 -352570884 416 160 -352571908 416 160 -352572932 416 160 -352573956 416 160 -352574980 416 160 -352576004 416 160 -343999748 416 160 -344000772 416 160 -344001796 416 160 -344002820 416 160 -344003844 416 160 -344004868 416 160 -344005892 416 160 -344006916 416 160 -344007940 416 160 -344008964 416 160 -344009988 416 160 -344011012 416 160 -344012036 416 160 -344013060 416 160 -344014084 416 160 -344015108 416 160 -344016132 416 160 -344017156 416 160 -344018180 416 160 -344019204 416 160 -344020228 416 160 -344021252 416 160 -344022276 416 160 -344023300 416 160 -344024324 416 160 -344025348 416 160 -344026372 416 160 -344027396 416 160 -344028420 416 160 -344029444 416 160 -344030468 416 160 -344031492 416 160 -344032516 416 160 -344033540 416 160 -344034564 416 160 -344035588 416 160 -344036612 416 160 -344037636 416 160 -344038660 416 160 -344039684 416 160 -344040708 416 160 -344041732 416 160 -344042756 416 160 -344043780 416 160 -344044804 416 160 -344045828 416 160 -344046852 416 160 -344047876 416 160 -344048900 416 160 -344049924 416 160 -344050948 416 160 -344051972 416 160 -344052996 416 160 -344054020 416 160 -344055044 416 160 -344056068 416 160 -344000004 416 160 -344001028 416 160 -344002052 416 160 -344003076 416 160 -344004100 416 160 -344005124 416 160 -344006148 416 160 -344007172 416 160 -344008196 416 160 -344009220 416 160 -344010244 416 160 -344011268 416 160 -344012292 416 160 -344013316 416 160 -344014340 416 160 -344015364 416 160 -344016388 416 160 -344017412 416 160 -344018436 416 160 -344019460 416 160 -344020484 416 160 -344021508 416 160 -344022532 416 160 -344023556 416 160 -344024580 416 160 -344025604 416 160 -344026628 416 160 -344027652 416 160 -344028676 416 160 -344029700 416 160 -344030724 416 160 -344031748 416 160 -344032772 416 160 -344033796 416 160 -344034820 416 160 -344035844 416 160 -344036868 416 160 -344037892 416 160 -344038916 416 160 -344039940 416 160 -344040964 416 160 -344041988 416 160 -344043012 416 160 -344044036 416 160 -344045060 416 160 -344046084 416 160 -344047108 416 160 -344048132 416 160 -344049156 416 160 -344050180 416 160 -344051204 416 160 -344052228 416 160 -344053252 416 160 -344054276 416 160 -344055300 416 160 -344056324 416 160 -344065284 416 160 -344066308 416 160 -344067332 416 160 -344068356 416 160 -344069380 416 160 -344070404 416 160 -344071428 416 160 -344072452 416 160 -344073476 416 160 -344074500 416 160 -344075524 416 160 -344076548 416 160 -344077572 416 160 -344078596 416 160 -344079620 416 160 -344080644 416 160 -344081668 416 160 -344082692 416 160 -344083716 416 160 -344084740 416 160 -344085764 416 160 -344086788 416 160 -344087812 416 160 -344088836 416 160 -344089860 416 160 -344090884 416 160 -344091908 416 160 -344092932 416 160 -344093956 416 160 -344094980 416 160 -344096004 416 160 -344097028 416 160 -344098052 416 160 -344099076 416 160 -344100100 416 160 -344101124 416 160 -344102148 416 160 -344103172 416 160 -344104196 416 160 -344105220 416 160 -344106244 416 160 -344107268 416 160 -344108292 416 160 -344109316 416 160 -344110340 416 160 -344111364 416 160 -344112388 416 160 -344113412 416 160 -344114436 416 160 -344115460 416 160 -344116484 416 160 -344117508 416 160 -344118532 416 160 -344119556 416 160 -344120580 416 160 -344121604 416 160 -344065540 416 160 -344066564 416 160 -344067588 416 160 -344068612 416 160 -344069636 416 160 -344070660 416 160 -344071684 416 160 -344072708 416 160 -344073732 416 160 -344074756 416 160 -344075780 416 160 -344076804 416 160 -344077828 416 160 -344078852 416 160 -344079876 416 160 -344080900 416 160 -344081924 416 160 -344082948 416 160 -344083972 416 160 -344084996 416 160 -344086020 416 160 -344087044 416 160 -344088068 416 160 -344089092 416 160 -344090116 416 160 -344091140 416 160 -344092164 416 160 -344093188 416 160 -344094212 416 160 -344095236 416 160 -344096260 416 160 -344097284 416 160 -344098308 416 160 -344099332 416 160 -344100356 416 160 -344101380 416 160 -344102404 416 160 -344103428 416 160 -344104452 416 160 -344105476 416 160 -344106500 416 160 -344107524 416 160 -344108548 416 160 -344109572 416 160 -344110596 416 160 -344111620 416 160 -344112644 416 160 -344113668 416 160 -344114692 416 160 -344115716 416 160 -344116740 416 160 -344117764 416 160 -344118788 416 160 -344119812 416 160 -344120836 416 160 -344121860 416 160 -344130820 416 160 -344131844 416 160 -344132868 416 160 -344133892 416 160 -344134916 416 160 -344135940 416 160 -344136964 416 160 -344137988 416 160 -344139012 416 160 -344140036 416 160 -344141060 416 160 -344142084 416 160 -344143108 416 160 -344144132 416 160 -344145156 416 160 -344146180 416 160 -344147204 416 160 -344148228 416 160 -344149252 416 160 -344150276 416 160 -344151300 416 160 -344152324 416 160 -344153348 416 160 -344154372 416 160 -344155396 416 160 -344156420 416 160 -344157444 416 160 -344158468 416 160 -344159492 416 160 -344160516 416 160 -344161540 416 160 -344162564 416 160 -344163588 416 160 -344164612 416 160 -344165636 416 160 -344166660 416 160 -344167684 416 160 -344168708 416 160 -344169732 416 160 -344170756 416 160 -344171780 416 160 -344172804 416 160 -344173828 416 160 -344174852 416 160 -344175876 416 160 -344176900 416 160 -344177924 416 160 -344178948 416 160 -344179972 416 160 -344180996 416 160 -344182020 416 160 -344183044 416 160 -344184068 416 160 -344185092 416 160 -344186116 416 160 -344187140 416 160 -344131076 416 160 -344132100 416 160 -344133124 416 160 -344134148 416 160 -344135172 416 160 -344136196 416 160 -344137220 416 160 -344138244 416 160 -344139268 416 160 -344140292 416 160 -344141316 416 160 -344142340 416 160 -344143364 416 160 -344144388 416 160 -344145412 416 160 -344146436 416 160 -344147460 416 160 -344148484 416 160 -344149508 416 160 -344150532 416 160 -344151556 416 160 -344152580 416 160 -344153604 416 160 -344154628 416 160 -344155652 416 160 -344156676 416 160 -344157700 416 160 -344158724 416 160 -344159748 416 160 -344160772 416 160 -344161796 416 160 -344162820 416 160 -344163844 416 160 -344164868 416 160 -344165892 416 160 -344166916 416 160 -344167940 416 160 -344168964 416 160 -344169988 416 160 -344171012 416 160 -344172036 416 160 -344173060 416 160 -344174084 416 160 -344175108 416 160 -344176132 416 160 -344177156 416 160 -344178180 416 160 -344179204 416 160 -344180228 416 160 -344181252 416 160 -344182276 416 160 -344183300 416 160 -344184324 416 160 -344185348 416 160 -344186372 416 160 -344187396 416 160 +303042564 416 160 +303042568 416 160 +303042572 416 160 +303042576 416 160 +303042580 416 160 +303042584 416 160 +303042588 416 160 +303042592 416 160 +303046660 416 160 +303046664 416 160 +303046668 416 160 +303046672 416 160 +303046676 416 160 +303046680 416 160 +303046684 416 160 +303046688 416 160 +303050756 416 160 +303050760 416 160 +303050764 416 160 +303050768 416 160 +303050772 416 160 +303050776 416 160 +303050780 416 160 +303050784 416 160 +303054852 416 160 +303054856 416 160 +303054860 416 160 +303054864 416 160 +303054868 416 160 +303054872 416 160 +303054876 416 160 +303054880 416 160 +303058948 416 160 +303058952 416 160 +303058956 416 160 +303058960 416 160 +303058964 416 160 +303058968 416 160 +303058972 416 160 +303058976 416 160 +303063044 416 160 +303063048 416 160 +303063052 416 160 +303063056 416 160 +303063060 416 160 +303063064 416 160 +303063068 416 160 +303063072 416 160 +303067140 416 160 +303067144 416 160 +303067148 416 160 +303067152 416 160 +303067156 416 160 +303067160 416 160 +303067164 416 160 +303067168 416 160 +303071236 416 160 +303071240 416 160 +303071244 416 160 +303071248 416 160 +303071252 416 160 +303071256 416 160 +303071260 416 160 +303071264 416 160 +303075332 416 160 +303075336 416 160 +303075340 416 160 +303075344 416 160 +303075348 416 160 +303075352 416 160 +303075356 416 160 +303075360 416 160 +303079428 416 160 +303079432 416 160 +303079436 416 160 +303079440 416 160 +303079444 416 160 +303079448 416 160 +303079452 416 160 +303079456 416 160 +303083524 416 160 +303083528 416 160 +303083532 416 160 +303083536 416 160 +303083540 416 160 +303083544 416 160 +303083548 416 160 +303083552 416 160 +303087620 416 160 +303087624 416 160 +303087628 416 160 +303087632 416 160 +303087636 416 160 +303087640 416 160 +303087644 416 160 +303087648 416 160 +304091140 416 160 +304091144 416 160 +304091148 416 160 +304091152 416 160 +304091156 416 160 +304091160 416 160 +304091164 416 160 +304091168 416 160 +304095236 416 160 +304095240 416 160 +304095244 416 160 +304095248 416 160 +304095252 416 160 +304095256 416 160 +304095260 416 160 +304095264 416 160 +304099332 416 160 +304099336 416 160 +304099340 416 160 +304099344 416 160 +304099348 416 160 +304099352 416 160 +304099356 416 160 +304099360 416 160 +304103428 416 160 +304103432 416 160 +304103436 416 160 +304103440 416 160 +304103444 416 160 +304103448 416 160 +304103452 416 160 +304103456 416 160 +304107524 416 160 +304107528 416 160 +304107532 416 160 +304107536 416 160 +304107540 416 160 +304107544 416 160 +304107548 416 160 +304107552 416 160 +304111620 416 160 +304111624 416 160 +304111628 416 160 +304111632 416 160 +304111636 416 160 +304111640 416 160 +304111644 416 160 +304111648 416 160 +304115716 416 160 +304115720 416 160 +304115724 416 160 +304115728 416 160 +304115732 416 160 +304115736 416 160 +304115740 416 160 +304115744 416 160 +304119812 416 160 +304119816 416 160 +304119820 416 160 +304119824 416 160 +304119828 416 160 +304119832 416 160 +304119836 416 160 +304119840 416 160 +304123908 416 160 +304123912 416 160 +304123916 416 160 +304123920 416 160 +304123924 416 160 +304123928 416 160 +304123932 416 160 +304123936 416 160 +304128004 416 160 +304128008 416 160 +304128012 416 160 +304128016 416 160 +304128020 416 160 +304128024 416 160 +304128028 416 160 +304128032 416 160 +304132100 416 160 +304132104 416 160 +304132108 416 160 +304132112 416 160 +304132116 416 160 +304132120 416 160 +304132124 416 160 +304132128 416 160 +304136196 416 160 +304136200 416 160 +304136204 416 160 +304136208 416 160 +304136212 416 160 +304136216 416 160 +304136220 416 160 +304136224 416 160 +304140292 416 160 +304140296 416 160 +304140300 416 160 +304140304 416 160 +304140308 416 160 +304140312 416 160 +304140316 416 160 +304140320 416 160 +304144388 416 160 +304144392 416 160 +304144396 416 160 +304144400 416 160 +304144404 416 160 +304144408 416 160 +304144412 416 160 +304144416 416 160 +304148484 416 160 +304148488 416 160 +304148492 416 160 +304148496 416 160 +304148500 416 160 +304148504 416 160 +304148508 416 160 +304148512 416 160 +304152580 416 160 +304152584 416 160 +304152588 416 160 +304152592 416 160 +304152596 416 160 +304152600 416 160 +304152604 416 160 +304152608 416 160 +304156676 416 160 +304156680 416 160 +304156684 416 160 +304156688 416 160 +304156692 416 160 +304156696 416 160 +304156700 416 160 +304156704 416 160 +304160772 416 160 +304160776 416 160 +304160780 416 160 +304160784 416 160 +304160788 416 160 +304160792 416 160 +304160796 416 160 +304160800 416 160 +304164868 416 160 +304164872 416 160 +304164876 416 160 +304164880 416 160 +304164884 416 160 +304164888 416 160 +304164892 416 160 +304164896 416 160 +304168964 416 160 +304168968 416 160 +304168972 416 160 +304168976 416 160 +304168980 416 160 +304168984 416 160 +304168988 416 160 +304168992 416 160 +304173060 416 160 +304173064 416 160 +304173068 416 160 +304173072 416 160 +304173076 416 160 +304173080 416 160 +304173084 416 160 +304173088 416 160 +304177156 416 160 +304177160 416 160 +304177164 416 160 +304177168 416 160 +304177172 416 160 +304177176 416 160 +304177180 416 160 +304177184 416 160 +304181252 416 160 +304181256 416 160 +304181260 416 160 +304181264 416 160 +304181268 416 160 +304181272 416 160 +304181276 416 160 +304181280 416 160 +304185348 416 160 +304185352 416 160 +304185356 416 160 +304185360 416 160 +304185364 416 160 +304185368 416 160 +304185372 416 160 +304185376 416 160 +304189444 416 160 +304189448 416 160 +304189452 416 160 +304189456 416 160 +304189460 416 160 +304189464 416 160 +304189468 416 160 +304189472 416 160 +304193540 416 160 +304193544 416 160 +304193548 416 160 +304193552 416 160 +304193556 416 160 +304193560 416 160 +304193564 416 160 +304193568 416 160 +304197636 416 160 +304197640 416 160 +304197644 416 160 +304197648 416 160 +304197652 416 160 +304197656 416 160 +304197660 416 160 +304197664 416 160 +304201732 416 160 +304201736 416 160 +304201740 416 160 +304201744 416 160 +304201748 416 160 +304201752 416 160 +304201756 416 160 +304201760 416 160 +305139716 416 160 +305139720 416 160 +305139724 416 160 +305139728 416 160 +305139732 416 160 +305139736 416 160 +305139740 416 160 +305139744 416 160 +305143812 416 160 +305143816 416 160 +305143820 416 160 +305143824 416 160 +305143828 416 160 +305143832 416 160 +305143836 416 160 +305143840 416 160 +305147908 416 160 +305147912 416 160 +305147916 416 160 +305147920 416 160 +305147924 416 160 +305147928 416 160 +305147932 416 160 +305147936 416 160 +305152004 416 160 +305152008 416 160 +305152012 416 160 +305152016 416 160 +305152020 416 160 +305152024 416 160 +305152028 416 160 +305152032 416 160 +305156100 416 160 +305156104 416 160 +305156108 416 160 +305156112 416 160 +305156116 416 160 +305156120 416 160 +305156124 416 160 +305156128 416 160 +305160196 416 160 +305160200 416 160 +305160204 416 160 +305160208 416 160 +305160212 416 160 +305160216 416 160 +305160220 416 160 +305160224 416 160 +305164292 416 160 +305164296 416 160 +305164300 416 160 +305164304 416 160 +305164308 416 160 +305164312 416 160 +305164316 416 160 +305164320 416 160 +305168388 416 160 +305168392 416 160 +305168396 416 160 +305168400 416 160 +305168404 416 160 +305168408 416 160 +305168412 416 160 +305168416 416 160 +305172484 416 160 +305172488 416 160 +305172492 416 160 +305172496 416 160 +305172500 416 160 +305172504 416 160 +305172508 416 160 +305172512 416 160 +305176580 416 160 +305176584 416 160 +305176588 416 160 +305176592 416 160 +305176596 416 160 +305176600 416 160 +305176604 416 160 +305176608 416 160 +305180676 416 160 +305180680 416 160 +305180684 416 160 +305180688 416 160 +305180692 416 160 +305180696 416 160 +305180700 416 160 +305180704 416 160 +305184772 416 160 +305184776 416 160 +305184780 416 160 +305184784 416 160 +305184788 416 160 +305184792 416 160 +305184796 416 160 +305184800 416 160 +305188868 416 160 +305188872 416 160 +305188876 416 160 +305188880 416 160 +305188884 416 160 +305188888 416 160 +305188892 416 160 +305188896 416 160 +305192964 416 160 +305192968 416 160 +305192972 416 160 +305192976 416 160 +305192980 416 160 +305192984 416 160 +305192988 416 160 +305192992 416 160 +305197060 416 160 +305197064 416 160 +305197068 416 160 +305197072 416 160 +305197076 416 160 +305197080 416 160 +305197084 416 160 +305197088 416 160 +305201156 416 160 +305201160 416 160 +305201164 416 160 +305201168 416 160 +305201172 416 160 +305201176 416 160 +305201180 416 160 +305201184 416 160 +305205252 416 160 +305205256 416 160 +305205260 416 160 +305205264 416 160 +305205268 416 160 +305205272 416 160 +305205276 416 160 +305205280 416 160 +305209348 416 160 +305209352 416 160 +305209356 416 160 +305209360 416 160 +305209364 416 160 +305209368 416 160 +305209372 416 160 +305209376 416 160 +305213444 416 160 +305213448 416 160 +305213452 416 160 +305213456 416 160 +305213460 416 160 +305213464 416 160 +305213468 416 160 +305213472 416 160 +305217540 416 160 +305217544 416 160 +305217548 416 160 +305217552 416 160 +305217556 416 160 +305217560 416 160 +305217564 416 160 +305217568 416 160 +305221636 416 160 +305221640 416 160 +305221644 416 160 +305221648 416 160 +305221652 416 160 +305221656 416 160 +305221660 416 160 +305221664 416 160 +305225732 416 160 +305225736 416 160 +305225740 416 160 +305225744 416 160 +305225748 416 160 +305225752 416 160 +305225756 416 160 +305225760 416 160 +305229828 416 160 +305229832 416 160 +305229836 416 160 +305229840 416 160 +305229844 416 160 +305229848 416 160 +305229852 416 160 +305229856 416 160 +305233924 416 160 +305233928 416 160 +305233932 416 160 +305233936 416 160 +305233940 416 160 +305233944 416 160 +305233948 416 160 +305233952 416 160 +305238020 416 160 +305238024 416 160 +305238028 416 160 +305238032 416 160 +305238036 416 160 +305238040 416 160 +305238044 416 160 +305238048 416 160 +305242116 416 160 +305242120 416 160 +305242124 416 160 +305242128 416 160 +305242132 416 160 +305242136 416 160 +305242140 416 160 +305242144 416 160 +305246212 416 160 +305246216 416 160 +305246220 416 160 +305246224 416 160 +305246228 416 160 +305246232 416 160 +305246236 416 160 +305246240 416 160 +305250308 416 160 +305250312 416 160 +305250316 416 160 +305250320 416 160 +305250324 416 160 +305250328 416 160 +305250332 416 160 +305250336 416 160 +305254404 416 160 +305254408 416 160 +305254412 416 160 +305254416 416 160 +305254420 416 160 +305254424 416 160 +305254428 416 160 +305254432 416 160 +305258500 416 160 +305258504 416 160 +305258508 416 160 +305258512 416 160 +305258516 416 160 +305258520 416 160 +305258524 416 160 +305258528 416 160 +305262596 416 160 +305262600 416 160 +305262604 416 160 +305262608 416 160 +305262612 416 160 +305262616 416 160 +305262620 416 160 +305262624 416 160 +305266692 416 160 +305266696 416 160 +305266700 416 160 +305266704 416 160 +305266708 416 160 +305266712 416 160 +305266716 416 160 +305266720 416 160 +305270788 416 160 +305270792 416 160 +305270796 416 160 +305270800 416 160 +305270804 416 160 +305270808 416 160 +305270812 416 160 +305270816 416 160 +305274884 416 160 +305274888 416 160 +305274892 416 160 +305274896 416 160 +305274900 416 160 +305274904 416 160 +305274908 416 160 +305274912 416 160 +305278980 416 160 +305278984 416 160 +305278988 416 160 +305278992 416 160 +305278996 416 160 +305279000 416 160 +305279004 416 160 +305279008 416 160 +305283076 416 160 +305283080 416 160 +305283084 416 160 +305283088 416 160 +305283092 416 160 +305283096 416 160 +305283100 416 160 +305283104 416 160 +305287172 416 160 +305287176 416 160 +305287180 416 160 +305287184 416 160 +305287188 416 160 +305287192 416 160 +305287196 416 160 +305287200 416 160 +305291268 416 160 +305291272 416 160 +305291276 416 160 +305291280 416 160 +305291284 416 160 +305291288 416 160 +305291292 416 160 +305291296 416 160 +305295364 416 160 +305295368 416 160 +305295372 416 160 +305295376 416 160 +305295380 416 160 +305295384 416 160 +305295388 416 160 +305295392 416 160 +305299460 416 160 +305299464 416 160 +305299468 416 160 +305299472 416 160 +305299476 416 160 +305299480 416 160 +305299484 416 160 +305299488 416 160 +305303556 416 160 +305303560 416 160 +305303564 416 160 +305303568 416 160 +305303572 416 160 +305303576 416 160 +305303580 416 160 +305303584 416 160 +305307652 416 160 +305307656 416 160 +305307660 416 160 +305307664 416 160 +305307668 416 160 +305307672 416 160 +305307676 416 160 +305307680 416 160 +305311748 416 160 +305311752 416 160 +305311756 416 160 +305311760 416 160 +305311764 416 160 +305311768 416 160 +305311772 416 160 +305311776 416 160 +305315844 416 160 +305315848 416 160 +305315852 416 160 +305315856 416 160 +305315860 416 160 +305315864 416 160 +305315868 416 160 +305315872 416 160 +306188292 416 160 +306188296 416 160 +306188300 416 160 +306188304 416 160 +306188308 416 160 +306188312 416 160 +306188316 416 160 +306188320 416 160 +306192388 416 160 +306192392 416 160 +306192396 416 160 +306192400 416 160 +306192404 416 160 +306192408 416 160 +306192412 416 160 +306192416 416 160 +306196484 416 160 +306196488 416 160 +306196492 416 160 +306196496 416 160 +306196500 416 160 +306196504 416 160 +306196508 416 160 +306196512 416 160 +306200580 416 160 +306200584 416 160 +306200588 416 160 +306200592 416 160 +306200596 416 160 +306200600 416 160 +306200604 416 160 +306200608 416 160 +306204676 416 160 +306204680 416 160 +306204684 416 160 +306204688 416 160 +306204692 416 160 +306204696 416 160 +306204700 416 160 +306204704 416 160 +306208772 416 160 +306208776 416 160 +306208780 416 160 +306208784 416 160 +306208788 416 160 +306208792 416 160 +306208796 416 160 +306208800 416 160 +306212868 416 160 +306212872 416 160 +306212876 416 160 +306212880 416 160 +306212884 416 160 +306212888 416 160 +306212892 416 160 +306212896 416 160 +306216964 416 160 +306216968 416 160 +306216972 416 160 +306216976 416 160 +306216980 416 160 +306216984 416 160 +306216988 416 160 +306216992 416 160 +306221060 416 160 +306221064 416 160 +306221068 416 160 +306221072 416 160 +306221076 416 160 +306221080 416 160 +306221084 416 160 +306221088 416 160 +306225156 416 160 +306225160 416 160 +306225164 416 160 +306225168 416 160 +306225172 416 160 +306225176 416 160 +306225180 416 160 +306225184 416 160 +306229252 416 160 +306229256 416 160 +306229260 416 160 +306229264 416 160 +306229268 416 160 +306229272 416 160 +306229276 416 160 +306229280 416 160 +306233348 416 160 +306233352 416 160 +306233356 416 160 +306233360 416 160 +306233364 416 160 +306233368 416 160 +306233372 416 160 +306233376 416 160 +306237444 416 160 +306237448 416 160 +306237452 416 160 +306237456 416 160 +306237460 416 160 +306237464 416 160 +306237468 416 160 +306237472 416 160 +306241540 416 160 +306241544 416 160 +306241548 416 160 +306241552 416 160 +306241556 416 160 +306241560 416 160 +306241564 416 160 +306241568 416 160 +306245636 416 160 +306245640 416 160 +306245644 416 160 +306245648 416 160 +306245652 416 160 +306245656 416 160 +306245660 416 160 +306245664 416 160 +306249732 416 160 +306249736 416 160 +306249740 416 160 +306249744 416 160 +306249748 416 160 +306249752 416 160 +306249756 416 160 +306249760 416 160 +306253828 416 160 +306253832 416 160 +306253836 416 160 +306253840 416 160 +306253844 416 160 +306253848 416 160 +306253852 416 160 +306253856 416 160 +306257924 416 160 +306257928 416 160 +306257932 416 160 +306257936 416 160 +306257940 416 160 +306257944 416 160 +306257948 416 160 +306257952 416 160 +306262020 416 160 +306262024 416 160 +306262028 416 160 +306262032 416 160 +306262036 416 160 +306262040 416 160 +306262044 416 160 +306262048 416 160 +306266116 416 160 +306266120 416 160 +306266124 416 160 +306266128 416 160 +306266132 416 160 +306266136 416 160 +306266140 416 160 +306266144 416 160 +306270212 416 160 +306270216 416 160 +306270220 416 160 +306270224 416 160 +306270228 416 160 +306270232 416 160 +306270236 416 160 +306270240 416 160 +306274308 416 160 +306274312 416 160 +306274316 416 160 +306274320 416 160 +306274324 416 160 +306274328 416 160 +306274332 416 160 +306274336 416 160 +306278404 416 160 +306278408 416 160 +306278412 416 160 +306278416 416 160 +306278420 416 160 +306278424 416 160 +306278428 416 160 +306278432 416 160 +306282500 416 160 +306282504 416 160 +306282508 416 160 +306282512 416 160 +306282516 416 160 +306282520 416 160 +306282524 416 160 +306282528 416 160 +306286596 416 160 +306286600 416 160 +306286604 416 160 +306286608 416 160 +306286612 416 160 +306286616 416 160 +306286620 416 160 +306286624 416 160 +306290692 416 160 +306290696 416 160 +306290700 416 160 +306290704 416 160 +306290708 416 160 +306290712 416 160 +306290716 416 160 +306290720 416 160 +306294788 416 160 +306294792 416 160 +306294796 416 160 +306294800 416 160 +306294804 416 160 +306294808 416 160 +306294812 416 160 +306294816 416 160 +306298884 416 160 +306298888 416 160 +306298892 416 160 +306298896 416 160 +306298900 416 160 +306298904 416 160 +306298908 416 160 +306298912 416 160 +306302980 416 160 +306302984 416 160 +306302988 416 160 +306302992 416 160 +306302996 416 160 +306303000 416 160 +306303004 416 160 +306303008 416 160 +306307076 416 160 +306307080 416 160 +306307084 416 160 +306307088 416 160 +306307092 416 160 +306307096 416 160 +306307100 416 160 +306307104 416 160 +306311172 416 160 +306311176 416 160 +306311180 416 160 +306311184 416 160 +306311188 416 160 +306311192 416 160 +306311196 416 160 +306311200 416 160 +306315268 416 160 +306315272 416 160 +306315276 416 160 +306315280 416 160 +306315284 416 160 +306315288 416 160 +306315292 416 160 +306315296 416 160 +306319364 416 160 +306319368 416 160 +306319372 416 160 +306319376 416 160 +306319380 416 160 +306319384 416 160 +306319388 416 160 +306319392 416 160 +306323460 416 160 +306323464 416 160 +306323468 416 160 +306323472 416 160 +306323476 416 160 +306323480 416 160 +306323484 416 160 +306323488 416 160 +306327556 416 160 +306327560 416 160 +306327564 416 160 +306327568 416 160 +306327572 416 160 +306327576 416 160 +306327580 416 160 +306327584 416 160 +306331652 416 160 +306331656 416 160 +306331660 416 160 +306331664 416 160 +306331668 416 160 +306331672 416 160 +306331676 416 160 +306331680 416 160 +306335748 416 160 +306335752 416 160 +306335756 416 160 +306335760 416 160 +306335764 416 160 +306335768 416 160 +306335772 416 160 +306335776 416 160 +306339844 416 160 +306339848 416 160 +306339852 416 160 +306339856 416 160 +306339860 416 160 +306339864 416 160 +306339868 416 160 +306339872 416 160 +306343940 416 160 +306343944 416 160 +306343948 416 160 +306343952 416 160 +306343956 416 160 +306343960 416 160 +306343964 416 160 +306343968 416 160 +306348036 416 160 +306348040 416 160 +306348044 416 160 +306348048 416 160 +306348052 416 160 +306348056 416 160 +306348060 416 160 +306348064 416 160 +306352132 416 160 +306352136 416 160 +306352140 416 160 +306352144 416 160 +306352148 416 160 +306352152 416 160 +306352156 416 160 +306352160 416 160 +306356228 416 160 +306356232 416 160 +306356236 416 160 +306356240 416 160 +306356244 416 160 +306356248 416 160 +306356252 416 160 +306356256 416 160 +306360324 416 160 +306360328 416 160 +306360332 416 160 +306360336 416 160 +306360340 416 160 +306360344 416 160 +306360348 416 160 +306360352 416 160 +306364420 416 160 +306364424 416 160 +306364428 416 160 +306364432 416 160 +306364436 416 160 +306364440 416 160 +306364444 416 160 +306364448 416 160 +306368516 416 160 +306368520 416 160 +306368524 416 160 +306368528 416 160 +306368532 416 160 +306368536 416 160 +306368540 416 160 +306368544 416 160 +306372612 416 160 +306372616 416 160 +306372620 416 160 +306372624 416 160 +306372628 416 160 +306372632 416 160 +306372636 416 160 +306372640 416 160 +306376708 416 160 +306376712 416 160 +306376716 416 160 +306376720 416 160 +306376724 416 160 +306376728 416 160 +306376732 416 160 +306376736 416 160 +306380804 416 160 +306380808 416 160 +306380812 416 160 +306380816 416 160 +306380820 416 160 +306380824 416 160 +306380828 416 160 +306380832 416 160 +306384900 416 160 +306384904 416 160 +306384908 416 160 +306384912 416 160 +306384916 416 160 +306384920 416 160 +306384924 416 160 +306384928 416 160 +306388996 416 160 +306389000 416 160 +306389004 416 160 +306389008 416 160 +306389012 416 160 +306389016 416 160 +306389020 416 160 +306389024 416 160 +306393092 416 160 +306393096 416 160 +306393100 416 160 +306393104 416 160 +306393108 416 160 +306393112 416 160 +306393116 416 160 +306393120 416 160 +306397188 416 160 +306397192 416 160 +306397196 416 160 +306397200 416 160 +306397204 416 160 +306397208 416 160 +306397212 416 160 +306397216 416 160 +306401284 416 160 +306401288 416 160 +306401292 416 160 +306401296 416 160 +306401300 416 160 +306401304 416 160 +306401308 416 160 +306401312 416 160 +306405380 416 160 +306405384 416 160 +306405388 416 160 +306405392 416 160 +306405396 416 160 +306405400 416 160 +306405404 416 160 +306405408 416 160 +306409476 416 160 +306409480 416 160 +306409484 416 160 +306409488 416 160 +306409492 416 160 +306409496 416 160 +306409500 416 160 +306409504 416 160 +306413572 416 160 +306413576 416 160 +306413580 416 160 +306413584 416 160 +306413588 416 160 +306413592 416 160 +306413596 416 160 +306413600 416 160 +306417668 416 160 +306417672 416 160 +306417676 416 160 +306417680 416 160 +306417684 416 160 +306417688 416 160 +306417692 416 160 +306417696 416 160 +306421764 416 160 +306421768 416 160 +306421772 416 160 +306421776 416 160 +306421780 416 160 +306421784 416 160 +306421788 416 160 +306421792 416 160 +306425860 416 160 +306425864 416 160 +306425868 416 160 +306425872 416 160 +306425876 416 160 +306425880 416 160 +306425884 416 160 +306425888 416 160 +306429956 416 160 +306429960 416 160 +306429964 416 160 +306429968 416 160 +306429972 416 160 +306429976 416 160 +306429980 416 160 +306429984 416 160 +306434052 416 160 +306434056 416 160 +306434060 416 160 +306434064 416 160 +306434068 416 160 +306434072 416 160 +306434076 416 160 +306434080 416 160 +306438148 416 160 +306438152 416 160 +306438156 416 160 +306438160 416 160 +306438164 416 160 +306438168 416 160 +306438172 416 160 +306438176 416 160 +306442244 416 160 +306442248 416 160 +306442252 416 160 +306442256 416 160 +306442260 416 160 +306442264 416 160 +306442268 416 160 +306442272 416 160 +306446340 416 160 +306446344 416 160 +306446348 416 160 +306446352 416 160 +306446356 416 160 +306446360 416 160 +306446364 416 160 +306446368 416 160 +352588804 416 160 +352592900 416 160 +352596996 416 160 +352601092 416 160 +352605188 416 160 +352609284 416 160 +352613380 416 160 +352617476 416 160 +352621572 416 160 +352625668 416 160 +352629764 416 160 +352633860 416 160 +352637956 416 160 +352642052 416 160 +352646148 416 160 +352650244 416 160 +352654340 416 160 +352658436 416 160 +352662532 416 160 +352666628 416 160 +352670724 416 160 +352674820 416 160 +352678916 416 160 +352683012 416 160 +352687108 416 160 +352691204 416 160 +352695300 416 160 +352699396 416 160 +352703492 416 160 +352707588 416 160 +352711684 416 160 +352715780 416 160 +352719876 416 160 +352723972 416 160 +352728068 416 160 +352732164 416 160 +352736260 416 160 +352740356 416 160 +352744452 416 160 +352748548 416 160 +352752644 416 160 +352756740 416 160 +352760836 416 160 +352764932 416 160 +352769028 416 160 +352773124 416 160 +352777220 416 160 +352781316 416 160 +352785412 416 160 +352789508 416 160 +352793604 416 160 +352797700 416 160 +352801796 416 160 +352805892 416 160 +352809988 416 160 +352814084 416 160 +352589828 416 160 +352593924 416 160 +352598020 416 160 +352602116 416 160 +352606212 416 160 +352610308 416 160 +352614404 416 160 +352618500 416 160 +352622596 416 160 +352626692 416 160 +352630788 416 160 +352634884 416 160 +352638980 416 160 +352643076 416 160 +352647172 416 160 +352651268 416 160 +352655364 416 160 +352659460 416 160 +352663556 416 160 +352667652 416 160 +352671748 416 160 +352675844 416 160 +352679940 416 160 +352684036 416 160 +352688132 416 160 +352692228 416 160 +352696324 416 160 +352700420 416 160 +352704516 416 160 +352708612 416 160 +352712708 416 160 +352716804 416 160 +352720900 416 160 +352724996 416 160 +352729092 416 160 +352733188 416 160 +352737284 416 160 +352741380 416 160 +352745476 416 160 +352749572 416 160 +352753668 416 160 +352757764 416 160 +352761860 416 160 +352765956 416 160 +352770052 416 160 +352774148 416 160 +352778244 416 160 +352782340 416 160 +352786436 416 160 +352790532 416 160 +352794628 416 160 +352798724 416 160 +352802820 416 160 +352806916 416 160 +352811012 416 160 +352815108 416 160 +352850948 416 160 +352855044 416 160 +352859140 416 160 +352863236 416 160 +352867332 416 160 +352871428 416 160 +352875524 416 160 +352879620 416 160 +352883716 416 160 +352887812 416 160 +352891908 416 160 +352896004 416 160 +352900100 416 160 +352904196 416 160 +352908292 416 160 +352912388 416 160 +352916484 416 160 +352920580 416 160 +352924676 416 160 +352928772 416 160 +352932868 416 160 +352936964 416 160 +352941060 416 160 +352945156 416 160 +352949252 416 160 +352953348 416 160 +352957444 416 160 +352961540 416 160 +352965636 416 160 +352969732 416 160 +352973828 416 160 +352977924 416 160 +352982020 416 160 +352986116 416 160 +352990212 416 160 +352994308 416 160 +352998404 416 160 +353002500 416 160 +353006596 416 160 +353010692 416 160 +353014788 416 160 +353018884 416 160 +353022980 416 160 +353027076 416 160 +353031172 416 160 +353035268 416 160 +353039364 416 160 +353043460 416 160 +353047556 416 160 +353051652 416 160 +353055748 416 160 +353059844 416 160 +353063940 416 160 +353068036 416 160 +353072132 416 160 +353076228 416 160 +352851972 416 160 +352856068 416 160 +352860164 416 160 +352864260 416 160 +352868356 416 160 +352872452 416 160 +352876548 416 160 +352880644 416 160 +352884740 416 160 +352888836 416 160 +352892932 416 160 +352897028 416 160 +352901124 416 160 +352905220 416 160 +352909316 416 160 +352913412 416 160 +352917508 416 160 +352921604 416 160 +352925700 416 160 +352929796 416 160 +352933892 416 160 +352937988 416 160 +352942084 416 160 +352946180 416 160 +352950276 416 160 +352954372 416 160 +352958468 416 160 +352962564 416 160 +352966660 416 160 +352970756 416 160 +352974852 416 160 +352978948 416 160 +352983044 416 160 +352987140 416 160 +352991236 416 160 +352995332 416 160 +352999428 416 160 +353003524 416 160 +353007620 416 160 +353011716 416 160 +353015812 416 160 +353019908 416 160 +353024004 416 160 +353028100 416 160 +353032196 416 160 +353036292 416 160 +353040388 416 160 +353044484 416 160 +353048580 416 160 +353052676 416 160 +353056772 416 160 +353060868 416 160 +353064964 416 160 +353069060 416 160 +353073156 416 160 +353077252 416 160 +353113092 416 160 +353117188 416 160 +353121284 416 160 +353125380 416 160 +353129476 416 160 +353133572 416 160 +353137668 416 160 +353141764 416 160 +353145860 416 160 +353149956 416 160 +353154052 416 160 +353158148 416 160 +353162244 416 160 +353166340 416 160 +353170436 416 160 +353174532 416 160 +353178628 416 160 +353182724 416 160 +353186820 416 160 +353190916 416 160 +353195012 416 160 +353199108 416 160 +353203204 416 160 +353207300 416 160 +353211396 416 160 +353215492 416 160 +353219588 416 160 +353223684 416 160 +353227780 416 160 +353231876 416 160 +353235972 416 160 +353240068 416 160 +353244164 416 160 +353248260 416 160 +353252356 416 160 +353256452 416 160 +353260548 416 160 +353264644 416 160 +353268740 416 160 +353272836 416 160 +353276932 416 160 +353281028 416 160 +353285124 416 160 +353289220 416 160 +353293316 416 160 +353297412 416 160 +353301508 416 160 +353305604 416 160 +353309700 416 160 +353313796 416 160 +353317892 416 160 +353321988 416 160 +353326084 416 160 +353330180 416 160 +353334276 416 160 +353338372 416 160 +353114116 416 160 +353118212 416 160 +353122308 416 160 +353126404 416 160 +353130500 416 160 +353134596 416 160 +353138692 416 160 +353142788 416 160 +353146884 416 160 +353150980 416 160 +353155076 416 160 +353159172 416 160 +353163268 416 160 +353167364 416 160 +353171460 416 160 +353175556 416 160 +353179652 416 160 +353183748 416 160 +353187844 416 160 +353191940 416 160 +353196036 416 160 +353200132 416 160 +353204228 416 160 +353208324 416 160 +353212420 416 160 +353216516 416 160 +353220612 416 160 +353224708 416 160 +353228804 416 160 +353232900 416 160 +353236996 416 160 +353241092 416 160 +353245188 416 160 +353249284 416 160 +353253380 416 160 +353257476 416 160 +353261572 416 160 +353265668 416 160 +353269764 416 160 +353273860 416 160 +353277956 416 160 +353282052 416 160 +353286148 416 160 +353290244 416 160 +353294340 416 160 +353298436 416 160 +353302532 416 160 +353306628 416 160 +353310724 416 160 +353314820 416 160 +353318916 416 160 +353323012 416 160 +353327108 416 160 +353331204 416 160 +353335300 416 160 +353339396 416 160 +344200196 416 160 +344204292 416 160 +344208388 416 160 +344212484 416 160 +344216580 416 160 +344220676 416 160 +344224772 416 160 +344228868 416 160 +344232964 416 160 +344237060 416 160 +344241156 416 160 +344245252 416 160 +344249348 416 160 +344253444 416 160 +344257540 416 160 +344261636 416 160 +344265732 416 160 +344269828 416 160 +344273924 416 160 +344278020 416 160 +344282116 416 160 +344286212 416 160 +344290308 416 160 +344294404 416 160 +344298500 416 160 +344302596 416 160 +344306692 416 160 +344310788 416 160 +344314884 416 160 +344318980 416 160 +344323076 416 160 +344327172 416 160 +344331268 416 160 +344335364 416 160 +344339460 416 160 +344343556 416 160 +344347652 416 160 +344351748 416 160 +344355844 416 160 +344359940 416 160 +344364036 416 160 +344368132 416 160 +344372228 416 160 +344376324 416 160 +344380420 416 160 +344384516 416 160 +344388612 416 160 +344392708 416 160 +344396804 416 160 +344400900 416 160 +344404996 416 160 +344409092 416 160 +344413188 416 160 +344417284 416 160 +344421380 416 160 +344425476 416 160 +344201220 416 160 +344205316 416 160 +344209412 416 160 +344213508 416 160 +344217604 416 160 +344221700 416 160 +344225796 416 160 +344229892 416 160 +344233988 416 160 +344238084 416 160 +344242180 416 160 +344246276 416 160 +344250372 416 160 +344254468 416 160 +344258564 416 160 +344262660 416 160 +344266756 416 160 +344270852 416 160 +344274948 416 160 +344279044 416 160 +344283140 416 160 +344287236 416 160 +344291332 416 160 +344295428 416 160 +344299524 416 160 +344303620 416 160 +344307716 416 160 +344311812 416 160 +344315908 416 160 +344320004 416 160 +344324100 416 160 +344328196 416 160 +344332292 416 160 +344336388 416 160 +344340484 416 160 +344344580 416 160 +344348676 416 160 +344352772 416 160 +344356868 416 160 +344360964 416 160 +344365060 416 160 +344369156 416 160 +344373252 416 160 +344377348 416 160 +344381444 416 160 +344385540 416 160 +344389636 416 160 +344393732 416 160 +344397828 416 160 +344401924 416 160 +344406020 416 160 +344410116 416 160 +344414212 416 160 +344418308 416 160 +344422404 416 160 +344426500 416 160 +344462340 416 160 +344466436 416 160 +344470532 416 160 +344474628 416 160 +344478724 416 160 +344482820 416 160 +344486916 416 160 +344491012 416 160 +344495108 416 160 +344499204 416 160 +344503300 416 160 +344507396 416 160 +344511492 416 160 +344515588 416 160 +344519684 416 160 +344523780 416 160 +344527876 416 160 +344531972 416 160 +344536068 416 160 +344540164 416 160 +344544260 416 160 +344548356 416 160 +344552452 416 160 +344556548 416 160 +344560644 416 160 +344564740 416 160 +344568836 416 160 +344572932 416 160 +344577028 416 160 +344581124 416 160 +344585220 416 160 +344589316 416 160 +344593412 416 160 +344597508 416 160 +344601604 416 160 +344605700 416 160 +344609796 416 160 +344613892 416 160 +344617988 416 160 +344622084 416 160 +344626180 416 160 +344630276 416 160 +344634372 416 160 +344638468 416 160 +344642564 416 160 +344646660 416 160 +344650756 416 160 +344654852 416 160 +344658948 416 160 +344663044 416 160 +344667140 416 160 +344671236 416 160 +344675332 416 160 +344679428 416 160 +344683524 416 160 +344687620 416 160 +344463364 416 160 +344467460 416 160 +344471556 416 160 +344475652 416 160 +344479748 416 160 +344483844 416 160 +344487940 416 160 +344492036 416 160 +344496132 416 160 +344500228 416 160 +344504324 416 160 +344508420 416 160 +344512516 416 160 +344516612 416 160 +344520708 416 160 +344524804 416 160 +344528900 416 160 +344532996 416 160 +344537092 416 160 +344541188 416 160 +344545284 416 160 +344549380 416 160 +344553476 416 160 +344557572 416 160 +344561668 416 160 +344565764 416 160 +344569860 416 160 +344573956 416 160 +344578052 416 160 +344582148 416 160 +344586244 416 160 +344590340 416 160 +344594436 416 160 +344598532 416 160 +344602628 416 160 +344606724 416 160 +344610820 416 160 +344614916 416 160 +344619012 416 160 +344623108 416 160 +344627204 416 160 +344631300 416 160 +344635396 416 160 +344639492 416 160 +344643588 416 160 +344647684 416 160 +344651780 416 160 +344655876 416 160 +344659972 416 160 +344664068 416 160 +344668164 416 160 +344672260 416 160 +344676356 416 160 +344680452 416 160 +344684548 416 160 +344688644 416 160 +344724484 416 160 +344728580 416 160 +344732676 416 160 +344736772 416 160 +344740868 416 160 +344744964 416 160 +344749060 416 160 +344753156 416 160 +344757252 416 160 +344761348 416 160 +344765444 416 160 +344769540 416 160 +344773636 416 160 +344777732 416 160 +344781828 416 160 +344785924 416 160 +344790020 416 160 +344794116 416 160 +344798212 416 160 +344802308 416 160 +344806404 416 160 +344810500 416 160 +344814596 416 160 +344818692 416 160 +344822788 416 160 +344826884 416 160 +344830980 416 160 +344835076 416 160 +344839172 416 160 +344843268 416 160 +344847364 416 160 +344851460 416 160 +344855556 416 160 +344859652 416 160 +344863748 416 160 +344867844 416 160 +344871940 416 160 +344876036 416 160 +344880132 416 160 +344884228 416 160 +344888324 416 160 +344892420 416 160 +344896516 416 160 +344900612 416 160 +344904708 416 160 +344908804 416 160 +344912900 416 160 +344916996 416 160 +344921092 416 160 +344925188 416 160 +344929284 416 160 +344933380 416 160 +344937476 416 160 +344941572 416 160 +344945668 416 160 +344949764 416 160 +344725508 416 160 +344729604 416 160 +344733700 416 160 +344737796 416 160 +344741892 416 160 +344745988 416 160 +344750084 416 160 +344754180 416 160 +344758276 416 160 +344762372 416 160 +344766468 416 160 +344770564 416 160 +344774660 416 160 +344778756 416 160 +344782852 416 160 +344786948 416 160 +344791044 416 160 +344795140 416 160 +344799236 416 160 +344803332 416 160 +344807428 416 160 +344811524 416 160 +344815620 416 160 +344819716 416 160 +344823812 416 160 +344827908 416 160 +344832004 416 160 +344836100 416 160 +344840196 416 160 +344844292 416 160 +344848388 416 160 +344852484 416 160 +344856580 416 160 +344860676 416 160 +344864772 416 160 +344868868 416 160 +344872964 416 160 +344877060 416 160 +344881156 416 160 +344885252 416 160 +344889348 416 160 +344893444 416 160 +344897540 416 160 +344901636 416 160 +344905732 416 160 +344909828 416 160 +344913924 416 160 +344918020 416 160 +344922116 416 160 +344926212 416 160 +344930308 416 160 +344934404 416 160 +344938500 416 160 +344942596 416 160 +344946692 416 160 +344950788 416 160 diff --git a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py index 104b6da084c2b..3688c9596adf7 100644 --- a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py @@ -1,29 +1,32 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("ICALIB") -#process.load("Configuration.StandardSequences.FakeConditions_cff") -process.load("Configuration.StandardSequences.Services_cff") -#process.load("Configuration.StandardSequences.Geometry_cff") -#process.load("SLHCUpgradeSimulations.Geometry.Phase1_R39F16_smpx_cmsSimIdealGeometryXML_cff") -#process.load('SLHCUpgradeSimulations.Geometry.Phase1_R34F16_cmsSimIdealGeometryXML_cff') -process.load('SLHCUpgradeSimulations.Geometry.Phase1_R30F12_cmsSimIdealGeometryXML_cff') -#process.load('SLHCUpgradeSimulations.Geometry.fakeConditions_Phase1_R30F12_cff') - -process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", - appendToDataLabel = cms.string( "" ), - fromDDD = cms.bool( False ), - applyAlignment = cms.bool( False ), - alignmentsLabel = cms.string( "" ) -) -process.TrackerGeometricDetESModule = cms.ESProducer( "TrackerGeometricDetESModule", - fromDDD = cms.bool( False ) -) - -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -process.GlobalTag.globaltag = 'DESIGN53_V3::All' -print process.TrackerGeometricDetESModule.fromDDD -print process.TrackerDigiGeometryESModule.fromDDD,process.TrackerDigiGeometryESModule.applyAlignment +process.load("Configuration.StandardSequences.Services_cff") +process.load('Configuration.Geometry.GeometryExtended2017_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') + + +#process.TrackerDigiGeometryESModule = cms.ESProducer( "TrackerDigiGeometryESModule", +# appendToDataLabel = cms.string( "" ), +# fromDDD = cms.bool( False ), +# applyAlignment = cms.bool( False ), +# alignmentsLabel = cms.string( "" ) +#) +#rocess.TrackerGeometricDetESModule = cms.ESProducer( "TrackerGeometricDetESModule", +# fromDDD = cms.bool( False ) +#) +process.load('Geometry.TrackerGeometryBuilder.trackerSLHCGeometry_cfi') +process.trackerSLHCGeometry.applyAlignment = cms.bool(False) + + +from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgrade2017', '') + +#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +#process.GlobalTag.globaltag = 'DESIGN61_V10::All' +#print process.TrackerGeometricDetESModule.fromDDD +#print process.TrackerDigiGeometryESModule.fromDDD,process.TrackerDigiGeometryESModule.applyAlignment process.source = cms.Source("EmptyIOVSource", firstValue = cms.uint64(1), From d5fed5543dccffd0861766bded73677fce2f30c6 Mon Sep 17 00:00:00 2001 From: Gaelle Date: Mon, 9 Feb 2015 09:32:51 +0100 Subject: [PATCH 2/2] up to reco --- .../python/relval_steps.py | 6 +- .../python/Phase1PU140_ConversionStep_cff.py | 259 +---------------- .../python/Phase1PU70_ConversionStep_cff.py | 260 +----------------- .../Configuration/python/phase1TkCustoms.py | 55 +++- 4 files changed, 70 insertions(+), 510 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 6e7d719e7c681..af0e6e1c47338 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1357,11 +1357,11 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''): } if cust!=None : upgradeStepDict['DigiTrkTrigFull'][k]['--customise']=cust - upgradeStepDict['RecoFull'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM', + upgradeStepDict['RecoFull'][k] = {'-s':'RAW2DIGI,L1Reco,RECO', '--conditions':gt, - '--datatier':'GEN-SIM-RECO,DQMIO', + '--datatier':'GEN-SIM-RECO', '-n':'10', - '--eventcontent':'FEVTDEBUGHLT,DQM', + '--eventcontent':'FEVTDEBUGHLT', '--magField' : '38T_PostLS1', '--geometry' : geom } diff --git a/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py index 98f8fdc6268de..b03935d4c8817 100644 --- a/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py @@ -4,204 +4,19 @@ import FWCore.ParameterSet.Config as cms from RecoTracker.ConversionSeedGenerators.Phase1PU140_PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi import * -from RecoTracker.ConversionSeedGenerators.ConversionStep2_cff import * +from RecoTracker.ConversionSeedGenerators.ConversionStep_cff import * from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * -convClusters = trackClusterRemover.clone( - maxChi2 = cms.double(30.0), - trajectories = cms.InputTag("pixelPairStepTracks"), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), - overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), - TrackQuality = cms.string('highPurity'), -) +#convClusters = trackClusterRemover.clone( +# maxChi2 = cms.double(30.0), +# trajectories = cms.InputTag("pixelPairStepTracks"), +# pixelClusters = cms.InputTag("siPixelClusters"), +# stripClusters = cms.InputTag("siStripClusters"), +# oldClusterRemovalInfo = cms.InputTag("pixelPairStepClusters"), +# overrideTrkQuals = cms.InputTag('pixelPairStepSelector','pixelPairStep'), +# TrackQuality = cms.string('highPurity'), +#) -convLayerPairs = cms.EDProducer("SeedingLayersEDProducer", - layerList = cms.vstring('BPix1+BPix2', - - 'BPix2+BPix3', - 'BPix2+FPix1_pos', - 'BPix2+FPix1_neg', - 'BPix2+FPix2_pos', - 'BPix2+FPix2_neg', - - 'FPix1_pos+FPix2_pos', - 'FPix1_neg+FPix2_neg', - - 'BPix3+TIB1', - 'BPix3+TIB2', - - 'TIB1+TID1_pos', - 'TIB1+TID1_neg', - 'TIB1+TID2_pos', - 'TIB1+TID2_neg', - 'TIB1+TIB2', - 'TIB1+TIB3', - - 'TIB2+TID1_pos', - 'TIB2+TID1_neg', - 'TIB2+TID2_pos', - 'TIB2+TID2_neg', - 'TIB2+TIB3', - 'TIB2+TIB4', - - 'TIB3+TIB4', - 'TIB3+TOB1', - 'TIB3+TID1_pos', - 'TIB3+TID1_neg', - - 'TIB4+TOB1', - 'TIB4+TOB2', - - 'TOB1+TOB2', - 'TOB1+TOB3', - 'TOB1+TEC1_pos', - 'TOB1+TEC1_neg', - - 'TOB2+TOB3', - 'TOB2+TOB4', - 'TOB2+TEC1_pos', - 'TOB2+TEC1_neg', - - #NB: re-introduce these combinations when large displaced - # tracks, reconstructed only in TOB will be available - # For instance think at the OutIn Ecal Seeded tracks - #'TOB3+TOB4', - #'TOB3+TOB5', - #'TOB3+TEC1_pos', - #'TOB3+TEC1_neg', - # - #'TOB4+TOB5', - #'TOB4+TOB6', - # - #'TOB5+TOB6', - - 'TID1_pos+TID2_pos', - 'TID2_pos+TID3_pos', - 'TID3_pos+TEC1_pos', - - 'TID1_neg+TID2_neg', - 'TID2_neg+TID3_neg', - 'TID3_neg+TEC1_neg', - - 'TEC1_pos+TEC2_pos', - 'TEC2_pos+TEC3_pos', - 'TEC3_pos+TEC4_pos', - 'TEC4_pos+TEC5_pos', - 'TEC5_pos+TEC6_pos', - 'TEC6_pos+TEC7_pos', - 'TEC7_pos+TEC8_pos', - - 'TEC1_neg+TEC2_neg', - 'TEC2_neg+TEC3_neg', - 'TEC3_neg+TEC4_neg', - 'TEC4_neg+TEC5_neg', - 'TEC5_neg+TEC6_neg', - 'TEC6_neg+TEC7_neg', - 'TEC7_neg+TEC8_neg' - #other combinations could be added - ), - - BPix = cms.PSet( - TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelPairs'), - HitProducer = cms.string('siPixelRecHits'), - skipClusters = cms.InputTag('convClusters'), - ), - FPix = cms.PSet( - TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelPairs'), - HitProducer = cms.string('siPixelRecHits'), - skipClusters = cms.InputTag('convClusters'), - ), - TIB1 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TIB2 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TIB3 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TIB4 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TID1 = cms.PSet( - useSimpleRphiHitsCleaner = cms.bool(False), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - useRingSlector = cms.bool(True), - TTRHBuilder = cms.string('WithTrackAngle'), - maxRing = cms.int32(2), - minRing = cms.int32(1), - skipClusters = cms.InputTag('convClusters'), - ), - TID2 = cms.PSet( - useSimpleRphiHitsCleaner = cms.bool(False), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - useRingSlector = cms.bool(True), - TTRHBuilder = cms.string('WithTrackAngle'), - maxRing = cms.int32(2), - minRing = cms.int32(1), - skipClusters = cms.InputTag('convClusters'), - ), - TID3 = cms.PSet( - useSimpleRphiHitsCleaner = cms.bool(False), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - useRingSlector = cms.bool(True), - TTRHBuilder = cms.string('WithTrackAngle'), - maxRing = cms.int32(2), - minRing = cms.int32(1), - skipClusters = cms.InputTag('convClusters'), - ), - TEC = cms.PSet( - useSimpleRphiHitsCleaner = cms.bool(False), - minRing = cms.int32(1), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - useRingSlector = cms.bool(True), - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHitUnmatched"), - maxRing = cms.int32(7), - stereoRecHits = cms.InputTag("siStripMatchedRecHits","stereoRecHitUnmatched"), - skipClusters = cms.InputTag('convClusters'), - ), - TOB1 = cms.PSet( - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - TTRHBuilder = cms.string('WithTrackAngle'), - skipClusters = cms.InputTag('convClusters'), - ), - TOB2 = cms.PSet( - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - TTRHBuilder = cms.string('WithTrackAngle'), - skipClusters = cms.InputTag('convClusters'), - ), - TOB3 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TOB4 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TOB5 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TOB6 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ) - ) photonConvTrajSeedFromSingleLeg.TrackRefitter = cms.InputTag('generalTracks') @@ -231,10 +46,6 @@ # MAKING OF TRACK CANDIDATES import RecoTracker.CkfPattern.CkfTrackCandidates_cfi -convTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( - src = cms.InputTag('photonConvTrajSeedFromSingleLeg:convSeedCandidates'), - TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder')) -) import TrackingTools.TrackFitters.RungeKuttaFitters_cff convStepFitterSmoother = TrackingTools.TrackFitters.RungeKuttaFitters_cff.KFFittingSmootherWithOutliersRejectionAndRK.clone( @@ -251,59 +62,9 @@ # TRACK FITTING import RecoTracker.TrackProducer.TrackProducer_cfi -convStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone( - src = 'convTrackCandidates', - AlgorithmName = cms.string('conversionStep'), - Fitter = 'convStepFitterSmoother', - TTRHBuilder=cms.string('WithTrackAngle') - ) import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi -convStepSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( - src='convStepTracks', - trackSelectors= cms.VPSet( - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'convStepLoose', - applyAdaptedPVCuts = False, - chi2n_par = 3.0, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 1, - d0_par1 = ( 5., 8.0 ), - dz_par1 = ( 5., 8.0 ), - d0_par2 = ( 5., 8.0 ), - dz_par2 = ( 5., 8.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'convStepTight', - preFilterName = 'convStepLoose', - chi2n_par = 2.5, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 1, - d0_par1 = ( 5., 8.0 ), - dz_par1 = ( 5., 8.0 ), - d0_par2 = ( 5., 8.0 ), - dz_par2 = ( 5., 8.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'convStep', - preFilterName = 'convStepTight', - chi2n_par = 2.0, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 1, - d0_par1 = ( 5., 8.0 ), - dz_par1 = ( 5., 8.0 ), - d0_par2 = ( 5., 8.0 ), - dz_par2 = ( 5., 8.0 ) - ), - ) #end of vpset - ) #end of clone ConvStep = cms.Sequence( convClusters + convLayerPairs diff --git a/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py index ff904931ddd50..5477a41712345 100644 --- a/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py @@ -4,204 +4,18 @@ import FWCore.ParameterSet.Config as cms from RecoTracker.ConversionSeedGenerators.Phase1PU70_PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi import * -from RecoTracker.ConversionSeedGenerators.ConversionStep2_cff import * +from RecoTracker.ConversionSeedGenerators.ConversionStep_cff import * from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import * -convClusters = trackClusterRemover.clone( - maxChi2 = cms.double(30.0), - trajectories = cms.InputTag("tobTecStepTracks"), - pixelClusters = cms.InputTag("siPixelClusters"), - stripClusters = cms.InputTag("siStripClusters"), - oldClusterRemovalInfo = cms.InputTag("tobTecStepClusters"), - overrideTrkQuals = cms.InputTag('tobTecStepSelector','tobTecStep'), - TrackQuality = cms.string('highPurity'), -) - -convLayerPairs = cms.EDProducer("SeedingLayersEDProducer", - layerList = cms.vstring('BPix1+BPix2', - - 'BPix2+BPix3', - 'BPix2+FPix1_pos', - 'BPix2+FPix1_neg', - 'BPix2+FPix2_pos', - 'BPix2+FPix2_neg', - - 'FPix1_pos+FPix2_pos', - 'FPix1_neg+FPix2_neg', - - 'BPix3+TIB1', - 'BPix3+TIB2', - - 'TIB1+TID1_pos', - 'TIB1+TID1_neg', - 'TIB1+TID2_pos', - 'TIB1+TID2_neg', - 'TIB1+TIB2', - 'TIB1+TIB3', - - 'TIB2+TID1_pos', - 'TIB2+TID1_neg', - 'TIB2+TID2_pos', - 'TIB2+TID2_neg', - 'TIB2+TIB3', - 'TIB2+TIB4', - - 'TIB3+TIB4', - 'TIB3+TOB1', - 'TIB3+TID1_pos', - 'TIB3+TID1_neg', - - 'TIB4+TOB1', - 'TIB4+TOB2', - - 'TOB1+TOB2', - 'TOB1+TOB3', - 'TOB1+TEC1_pos', - 'TOB1+TEC1_neg', - - 'TOB2+TOB3', - 'TOB2+TOB4', - 'TOB2+TEC1_pos', - 'TOB2+TEC1_neg', - - #NB: re-introduce these combinations when large displaced - # tracks, reconstructed only in TOB will be available - # For instance think at the OutIn Ecal Seeded tracks - #'TOB3+TOB4', - #'TOB3+TOB5', - #'TOB3+TEC1_pos', - #'TOB3+TEC1_neg', - # - #'TOB4+TOB5', - #'TOB4+TOB6', - # - #'TOB5+TOB6', - - 'TID1_pos+TID2_pos', - 'TID2_pos+TID3_pos', - 'TID3_pos+TEC1_pos', - - 'TID1_neg+TID2_neg', - 'TID2_neg+TID3_neg', - 'TID3_neg+TEC1_neg', - - 'TEC1_pos+TEC2_pos', - 'TEC2_pos+TEC3_pos', - 'TEC3_pos+TEC4_pos', - 'TEC4_pos+TEC5_pos', - 'TEC5_pos+TEC6_pos', - 'TEC6_pos+TEC7_pos', - 'TEC7_pos+TEC8_pos', - - 'TEC1_neg+TEC2_neg', - 'TEC2_neg+TEC3_neg', - 'TEC3_neg+TEC4_neg', - 'TEC4_neg+TEC5_neg', - 'TEC5_neg+TEC6_neg', - 'TEC6_neg+TEC7_neg', - 'TEC7_neg+TEC8_neg' - #other combinations could be added - ), - - BPix = cms.PSet( - TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelPairs'), - HitProducer = cms.string('siPixelRecHits'), - skipClusters = cms.InputTag('convClusters'), - ), - FPix = cms.PSet( - TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelPairs'), - HitProducer = cms.string('siPixelRecHits'), - skipClusters = cms.InputTag('convClusters'), - ), - TIB1 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TIB2 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TIB3 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TIB4 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TID1 = cms.PSet( - useSimpleRphiHitsCleaner = cms.bool(False), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - useRingSlector = cms.bool(True), - TTRHBuilder = cms.string('WithTrackAngle'), - maxRing = cms.int32(2), - minRing = cms.int32(1), - skipClusters = cms.InputTag('convClusters'), - ), - TID2 = cms.PSet( - useSimpleRphiHitsCleaner = cms.bool(False), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - useRingSlector = cms.bool(True), - TTRHBuilder = cms.string('WithTrackAngle'), - maxRing = cms.int32(2), - minRing = cms.int32(1), - skipClusters = cms.InputTag('convClusters'), - ), - TID3 = cms.PSet( - useSimpleRphiHitsCleaner = cms.bool(False), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - useRingSlector = cms.bool(True), - TTRHBuilder = cms.string('WithTrackAngle'), - maxRing = cms.int32(2), - minRing = cms.int32(1), - skipClusters = cms.InputTag('convClusters'), - ), - TEC = cms.PSet( - useSimpleRphiHitsCleaner = cms.bool(False), - minRing = cms.int32(1), - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - useRingSlector = cms.bool(True), - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHitUnmatched"), - maxRing = cms.int32(7), - stereoRecHits = cms.InputTag("siStripMatchedRecHits","stereoRecHitUnmatched"), - skipClusters = cms.InputTag('convClusters'), - ), - TOB1 = cms.PSet( - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - TTRHBuilder = cms.string('WithTrackAngle'), - skipClusters = cms.InputTag('convClusters'), - ), - TOB2 = cms.PSet( - matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - TTRHBuilder = cms.string('WithTrackAngle'), - skipClusters = cms.InputTag('convClusters'), - ), - TOB3 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TOB4 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TOB5 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ), - TOB6 = cms.PSet( - TTRHBuilder = cms.string('WithTrackAngle'), - rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"), - skipClusters = cms.InputTag('convClusters'), - ) - ) +#convClusters = trackClusterRemover.clone( +# maxChi2 = cms.double(30.0), +# trajectories = cms.InputTag("tobTecStepTracks"), +# pixelClusters = cms.InputTag("siPixelClusters"), +## stripClusters = cms.InputTag("siStripClusters"), +# oldClusterRemovalInfo = cms.InputTag("tobTecStepClusters"), +# overrideTrkQuals = cms.InputTag('tobTecStepSelector','tobTecStep'), +# TrackQuality = cms.string('highPurity'), +#) photonConvTrajSeedFromSingleLeg.TrackRefitter = cms.InputTag('generalTracks') @@ -231,10 +45,6 @@ # MAKING OF TRACK CANDIDATES import RecoTracker.CkfPattern.CkfTrackCandidates_cfi -convTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( - src = cms.InputTag('photonConvTrajSeedFromSingleLeg:convSeedCandidates'), - TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder')) -) import TrackingTools.TrackFitters.RungeKuttaFitters_cff convStepFitterSmoother = TrackingTools.TrackFitters.RungeKuttaFitters_cff.KFFittingSmootherWithOutliersRejectionAndRK.clone( @@ -251,59 +61,9 @@ # TRACK FITTING import RecoTracker.TrackProducer.TrackProducer_cfi -convStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone( - src = 'convTrackCandidates', - AlgorithmName = cms.string('conversionStep'), - Fitter = 'convStepFitterSmoother', - TTRHBuilder=cms.string('WithTrackAngle') - ) import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi -convStepSelector = RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( - src='convStepTracks', - trackSelectors= cms.VPSet( - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( - name = 'convStepLoose', - applyAdaptedPVCuts = False, - chi2n_par = 3.0, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 1, - d0_par1 = ( 5., 8.0 ), - dz_par1 = ( 5., 8.0 ), - d0_par2 = ( 5., 8.0 ), - dz_par2 = ( 5., 8.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.tightMTS.clone( - name = 'convStepTight', - preFilterName = 'convStepLoose', - chi2n_par = 2.5, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 1, - d0_par1 = ( 5., 8.0 ), - dz_par1 = ( 5., 8.0 ), - d0_par2 = ( 5., 8.0 ), - dz_par2 = ( 5., 8.0 ) - ), - RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.highpurityMTS.clone( - name = 'convStep', - preFilterName = 'convStepTight', - chi2n_par = 2.0, - res_par = ( 0.003, 0.001 ), - minNumberLayers = 3, - maxNumberLostLayers = 1, - minNumber3DLayers = 1, - d0_par1 = ( 5., 8.0 ), - dz_par1 = ( 5., 8.0 ), - d0_par2 = ( 5., 8.0 ), - dz_par2 = ( 5., 8.0 ) - ), - ) #end of vpset - ) #end of clone ConvStep = cms.Sequence( convClusters + convLayerPairs diff --git a/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py index 93ad4022e1b4d..374e7416e90e6 100644 --- a/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py +++ b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py @@ -70,7 +70,7 @@ def customise_Digi(process): def customise_DQM(process,pileup): # We cut down the number of iterative tracking steps process.dqmoffline_step.remove(process.muonAnalyzer) - process.dqmoffline_step.remove(process.jetMETAnalyzer) + #process.dqmoffline_step.remove(process.jetMETAnalyzer) #put isUpgrade flag==true process.SiPixelRawDataErrorSource.isUpgrade = cms.untracked.bool(True) @@ -172,7 +172,7 @@ def customise_Reco(process,pileup): process.MeasurementTracker.inactivePixelDetectorLabels = cms.VInputTag() # new layer list (3/4 pixel seeding) in InitialStep and pixelTracks - process.pixellayertriplets.layerList = cms.vstring( 'BPix1+BPix2+BPix3', + process.PixelLayerTriplets.layerList = cms.vstring( 'BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4', 'BPix1+BPix3+BPix4', 'BPix1+BPix2+BPix4', @@ -199,6 +199,45 @@ def customise_Reco(process,pileup): process.globalreco.remove(process.iterTracking) process.globalreco.remove(process.electronSeedsSeq) process.reconstruction_fromRECO.remove(process.trackingGlobalReco) + process.reconstruction_fromRECO.remove(process.electronSeedsSeq) + process.reconstruction_fromRECO.remove(process.initialStepSeeds) + process.reconstruction_fromRECO.remove(process.initialStepSelector) + process.reconstruction_fromRECO.remove(initialStepTrackCandidates) + process.reconstruction_fromRECO.remove(initialStepTracks) + process.reconstruction_fromRECO.remove(lowPtTripletStepClusters) + process.reconstruction_fromRECO.remove(lowPtTripletStepSeedLayers) + process.reconstruction_fromRECO.remove(lowPtTripletStepSeeds) + process.reconstruction_fromRECO.remove(lowPtTripletStepSelector) + process.reconstruction_fromRECO.remove(lowPtTripletStepTrackCandidates) + process.reconstruction_fromRECO.remove(lowPtTripletStepTracks) + + process.reconstruction_fromRECO.remove(mixedTripletStep) + process.reconstruction_fromRECO.remove(mixedTripletStepClusters) + process.reconstruction_fromRECO.remove(mixedTripletStepSeedLayersA) + process.reconstruction_fromRECO.remove(mixedTripletStepSeedLayersB) + process.reconstruction_fromRECO.remove(mixedTripletStepSeeds) + process.reconstruction_fromRECO.remove(mixedTripletStepSeedsA) + process.reconstruction_fromRECO.remove(mixedTripletStepSeedsB) + process.reconstruction_fromRECO.remove(mixedTripletStepSelector) + process.reconstruction_fromRECO.remove(mixedTripletStepTrackCandidates) + process.reconstruction_fromRECO.remove(mixedTripletStepTracks) + + process.reconstruction_fromRECO.remove(pixelPairStepClusters) + process.reconstruction_fromRECO.remove(pixelPairStepSeeds) + process.reconstruction_fromRECO.remove(pixelPairStepSeedLayers) + process.reconstruction_fromRECO.remove(pixelPairStepSelector) + process.reconstruction_fromRECO.remove(pixelPairStepTrackCandidates) + process.reconstruction_fromRECO.remove(pixelPairStepTracks) + + process.reconstruction_fromRECO.remove(tobTecStepClusters) + process.reconstruction_fromRECO.remove(tobTecStepSeeds) + #process.reconstruction_fromRECO.remove(tobTecStepSeedLayers) + process.reconstruction_fromRECO.remove(tobTecStepSelector) + process.reconstruction_fromRECO.remove(tobTecStepTrackCandidates) + process.reconstruction_fromRECO.remove(tobTecStepTracks) + + process.InitialStepPreSplitting.remove(siPixelClusters) + del process.iterTracking del process.ckftracks del process.ckftracks_woBH @@ -227,15 +266,15 @@ def customise_Reco(process,pileup): process.reconstruction.remove(process.castorreco) process.reconstruction.remove(process.CastorTowerReco) - process.reconstruction.remove(process.ak7BasicJets) - process.reconstruction.remove(process.ak7CastorJetID) + #process.reconstruction.remove(process.ak7BasicJets) + #process.reconstruction.remove(process.ak7CastorJetID) #the quadruplet merger configuration process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff") - process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" ) - process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" ) - process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" ) - process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" ) + process.PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" ) + process.PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" ) + process.PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" ) + process.PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" ) # Need these until pixel templates are used process.load("SLHCUpgradeSimulations.Geometry.recoFromSimDigis_cff")