From 30ec4e56a861889933bd972cc3eb72a09590fb6d Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 18 Apr 2016 14:47:19 +0200 Subject: [PATCH 1/2] fix memory leak --- .../Tracking/plugins/TrajectorySeedProducer.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc b/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc index c0b1b95578a60..07aad353c007a 100644 --- a/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc +++ b/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc @@ -193,12 +193,14 @@ void TrajectorySeedProducer::produce(edm::Event& e, const edm::EventSetup& es) std::vector innerHits(1,(const BaseTrackerRecHit*) innerHit->hit()); std::vector outerHits(1,(const BaseTrackerRecHit*) outerHit->hit()); - const RecHitsSortedInPhi* ihm=new RecHitsSortedInPhi (innerHits, selectedTrackingRegion->origin(), innerLayer); - const RecHitsSortedInPhi* ohm=new RecHitsSortedInPhi (outerHits, selectedTrackingRegion->origin(), outerLayer); - - HitDoublets result(*ihm,*ohm); - HitPairGeneratorFromLayerPair::doublets(*selectedTrackingRegion,*innerLayer,*outerLayer,*ihm,*ohm,es,0,result); + //const RecHitsSortedInPhi* ihm=new RecHitsSortedInPhi (innerHits, selectedTrackingRegion->origin(), innerLayer); + //const RecHitsSortedInPhi* ohm=new RecHitsSortedInPhi (outerHits, selectedTrackingRegion->origin(), outerLayer); + const RecHitsSortedInPhi ihm(innerHits, selectedTrackingRegion->origin(), innerLayer); + const RecHitsSortedInPhi ohm(outerHits, selectedTrackingRegion->origin(), outerLayer); + HitDoublets result(ihm,ohm); + HitPairGeneratorFromLayerPair::doublets(*selectedTrackingRegion,*innerLayer,*outerLayer,ihm,ohm,es,0,result); + if(result.size()!=0) { return true; From b73dfa8e9a9a172ebef7bfe24fa89f601996eb39 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 8 Mar 2016 19:17:00 +0100 Subject: [PATCH 2/2] resolve conflict --- .../EventContent/python/EventContent_cff.py | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index 674c2f3ddedd9..d25c4b8c8f5bc 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -769,9 +769,27 @@ def SwapKeepAndDrop(l): MINIAODEventContent.outputCommands.extend(MicroEventContent.outputCommands) MINIAODSIMEventContent.outputCommands.extend(MicroEventContentMC.outputCommands) +# +# +# RAWSIM Data Tier definition +# Meant as means to temporarily hold the RAW + AODSIM information as to allow the +# L1+HLT to be rerun at a later time. +# +RAWAODSIMEventContent = cms.PSet( + outputCommands = cms.untracked.vstring('drop *'), + eventAutoFlushCompressedSize=cms.untracked.int32(15*1024*1024), + compressionAlgorithm=cms.untracked.string("LZMA"), + compressionLevel=cms.untracked.int32(4) +) + +RAWAODSIMEventContent.outputCommands.extend(AODSIMEventContent.outputCommands) +RAWAODSIMEventContent.outputCommands.extend(L1TriggerRAW.outputCommands) +RAWAODSIMEventContent.outputCommands.extend(HLTriggerRAW.outputCommands) + + # in fastsim, normal digis are edaliases of simdigis # drop the simdigis to avoid complaints from the outputmodule related to duplicated branches if eras.fastSim.isChosen(): - for _entry in [FEVTDEBUGHLTEventContent,FEVTDEBUGEventContent,RECOSIMEventContent,AODSIMEventContent]: + for _entry in [FEVTDEBUGHLTEventContent,FEVTDEBUGEventContent,RECOSIMEventContent,AODSIMEventContent,RAWAODSIMEventContent]: fastSimEC.dropSimDigis(_entry.outputCommands)