Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

fix test to work with 7_X_X #8171

Merged
merged 1 commit into from Mar 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions RecoPixelVertexing/PixelTriplets/test/HitTripletProducer.cc
Expand Up @@ -94,6 +94,8 @@ void HitTripletProducer::analyze(
hNum->Fill(triplets.size());
edm::LogInfo("HitTripletProducer") << "size of triplets: "<<triplets.size();

theGenerator->clear();

}

#include "FWCore/Framework/interface/MakerMacros.h"
Expand Down
48 changes: 27 additions & 21 deletions RecoPixelVertexing/PixelTriplets/test/trip_cfg.py
Expand Up @@ -5,10 +5,6 @@

process = cms.Process("TKSEEDING")

# message logger
#process.MessageLogger = cms.Service("MessageLogger",
# default = cms.untracked.PSet( limit = cms.untracked.int32(10) )
#)

#Adding SimpleMemoryCheck service:
process.SimpleMemoryCheck=cms.Service("SimpleMemoryCheck",
Expand All @@ -27,27 +23,26 @@
process.source = source
process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) )

### conditions
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
#process.GlobalTag.globaltag = 'STARTUP3X_V14::All'
process.load('Configuration.StandardSequences.Services_cff')
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load('Configuration.EventContent.EventContent_cff')
process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff')
process.load('Configuration.StandardSequences.RawToDigi_cff')
process.load('Configuration.StandardSequences.L1Reco_cff')
process.load('Configuration.StandardSequences.Reconstruction_cff')
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff')

from Configuration.AlCa.GlobalTag import GlobalTag
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:startup', '')
from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')

### standard includes
process.load('Configuration/StandardSequences/Services_cff')
process.load('Configuration.StandardSequences.Geometry_cff')
process.load("Configuration.StandardSequences.RawToDigi_cff")
process.load("Configuration.EventContent.EventContent_cff")
process.load("Configuration.StandardSequences.MagneticField_cff")
process.load("Configuration.StandardSequences.Reconstruction_cff")


process.MessageLogger = cms.Service("MessageLogger",
debugModules = cms.untracked.vstring('*'),
destinations = cms.untracked.vstring('cout'),
cout = cms.untracked.PSet( threshold = cms.untracked.string('INFO'))
)
#process.MessageLogger = cms.Service("MessageLogger",
# debugModules = cms.untracked.vstring('*'),
# destinations = cms.untracked.vstring('cout'),
# cout = cms.untracked.PSet( threshold = cms.untracked.string('INFO'))
#)

from RecoPixelVertexing.PixelTriplets.PixelTripletHLTGenerator_cfi import *
from RecoPixelVertexing.PixelTriplets.PixelTripletLargeTipGenerator_cfi import *
Expand All @@ -74,3 +69,14 @@
#process.triplets.RegionFactoryPSet.RegionPSet.originHalfLength = cms.double(0.0001)

process.p = cms.Path(process.siPixelRecHits+process.PixelLayerTriplets+process.triplets)
#process.p = cms.Path(process.PixelLayerTriplets+process.triplets)


# customisation of the process.

# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.postLS1Customs
from SLHCUpgradeSimulations.Configuration.postLS1Customs import customisePostLS1

#call to customisation function customisePostLS1 imported from SLHCUpgradeSimulations.Configuration.postLS1Customs
process = customisePostLS1(process)