diff --git a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_gedGsfElectrons_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_gedGsfElectrons_cfi.py deleted file mode 100644 index d55cb2f0882ec..0000000000000 --- a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_gedGsfElectrons_cfi.py +++ /dev/null @@ -1,67 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -electronMcSignalHistosCfg = cms.PSet( - Nbinxyz = cms.int32(50), - Nbinp = cms.int32(50), Nbinp2D = cms.int32(50), -# Pmax = cms.double(300.0), - Pmax = cms.double(4500), - Nbinpt = cms.int32(50), Nbinpt2D = cms.int32(50), Nbinpteff = cms.int32(19),Ptmax = cms.double(1500.0), - Nbinfhits = cms.int32(30), Fhitsmax = cms.double(30.0), - Nbinlhits = cms.int32(5), Lhitsmax = cms.double(10.0), - Nbineta = cms.int32(50), Nbineta2D = cms.int32(50),Etamin = cms.double(-2.5), Etamax = cms.double(2.5), - Nbindeta = cms.int32(100), Detamin = cms.double(-0.005), Detamax = cms.double(0.005), - Nbindetamatch = cms.int32(100), Nbindetamatch2D = cms.int32(50), Detamatchmin = cms.double(-0.05), Detamatchmax = cms.double(0.05), - Nbinphi = cms.int32(64), Nbinphi2D = cms.int32(32), Phimin = cms.double(-3.2), Phimax = cms.double(3.2), - Nbindphi = cms.int32(100), Dphimin = cms.double(-0.01), Dphimax = cms.double(0.01), - Nbindphimatch = cms.int32(100), Nbindphimatch2D = cms.int32(50), Dphimatchmin = cms.double(-0.2), Dphimatchmax = cms.double(0.2), - Nbineop = cms.int32(50), Nbineop2D = cms.int32(30), -# Eopmax = cms.double(5.0), - Eopmax = cms.double(10), - Eopmaxsht = cms.double(3.0), - Nbinmee = cms.int32(100), Meemin = cms.double(0.0), Meemax = cms.double(150.), - Nbinhoe = cms.int32(100), Hoemin = cms.double(0.0), Hoemax = cms.double(0.5), - Nbinpoptrue = cms.int32(75), Poptruemin = cms.double(0.0), Poptruemax = cms.double(1.5), - Nbinerror = cms.int32(30), Energyerrormax = cms.double(150.0), - EfficiencyFlag = cms.bool(True), StatOverflowFlag = cms.bool(False) -) - -electronMcSignalValidator = cms.EDAnalyzer("ElectronMcSignalValidator", - - Verbosity = cms.untracked.int32(0), - FinalStep = cms.string("AtJobEnd"), - InputFile = cms.string(""), - OutputFile = cms.string(""), - InputFolderName = cms.string("EgammaV/ElectronMcSignalValidator"), - OutputFolderName = cms.string("EgammaV/ElectronMcSignalValidator"), - - mcTruthCollection = cms.InputTag("genParticles"), - electronCollection = cms.InputTag("gedGsfElectrons"), - electronCoreCollection = cms.InputTag("gedGsfElectronCores"), - electronTrackCollection = cms.InputTag("electronGsfTracks"), - electronSeedCollection = cms.InputTag("electronMergedSeeds"), - # ajout 04/02/2015 - offlinePrimaryVertices = cms.InputTag("offlinePrimaryVertices"), - # fin ajout - - beamSpot = cms.InputTag("offlineBeamSpot"), - readAOD = cms.bool(False), - - isoFromDepsTk03 = cms.InputTag(""), - isoFromDepsTk04 = cms.InputTag(""), - isoFromDepsEcalFull03 = cms.InputTag(""), - isoFromDepsEcalFull04 = cms.InputTag(""), - isoFromDepsEcalReduced03 = cms.InputTag(""), - isoFromDepsEcalReduced04 = cms.InputTag(""), - isoFromDepsHcal03 = cms.InputTag(""), - isoFromDepsHcal04 = cms.InputTag(""), - - MaxPt = cms.double(1500.0), - DeltaR = cms.double(0.05), - MaxAbsEta = cms.double(2.5), - MatchingID = cms.vint32(11,-11), - MatchingMotherID = cms.vint32(23,24,-24,32), - histosCfg = cms.PSet(electronMcSignalHistosCfg) -) - - - diff --git a/Validation/RecoEgamma/python/ElectronMcSignalValidatorPt1000_gedGsfElectrons_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalValidatorPt1000_gedGsfElectrons_cfi.py index 05a2f8612d44a..dfa0a2f8e2939 100644 --- a/Validation/RecoEgamma/python/ElectronMcSignalValidatorPt1000_gedGsfElectrons_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcSignalValidatorPt1000_gedGsfElectrons_cfi.py @@ -22,7 +22,7 @@ Nbinhoe = cms.int32(100), Hoemin = cms.double(0.0), Hoemax = cms.double(0.5), Nbinpoptrue = cms.int32(75), Poptruemin = cms.double(0.0), Poptruemax = cms.double(1.5), Nbinerror = cms.int32(30), Energyerrormax = cms.double(150.0), - EfficiencyFlag = cms.bool(False), StatOverflowFlag = cms.bool(False) + EfficiencyFlag = cms.bool(True), StatOverflowFlag = cms.bool(False) ) electronMcSignalValidatorPt1000 = cms.EDAnalyzer("ElectronMcSignalValidator", diff --git a/Validation/RecoEgamma/python/electronValidationSequence_cff.py b/Validation/RecoEgamma/python/electronValidationSequence_cff.py index 72fda44cfa179..f176dbe9dc2e9 100644 --- a/Validation/RecoEgamma/python/electronValidationSequence_cff.py +++ b/Validation/RecoEgamma/python/electronValidationSequence_cff.py @@ -1,8 +1,6 @@ import FWCore.ParameterSet.Config as cms from Validation.RecoEgamma.electronIsoFromDeps_cff import * -#from Validation.RecoEgamma.ElectronMcSignalValidator_cfi import * -#from Validation.RecoEgamma.ElectronMcFakeValidator_cfi import * from Validation.RecoEgamma.ElectronMcSignalValidator_gedGsfElectrons_cfi import * from Validation.RecoEgamma.ElectronMcFakeValidator_gedGsfElectrons_cfi import * from Validation.RecoEgamma.ElectronMcSignalValidatorPt1000_gedGsfElectrons_cfi import * diff --git a/Validation/RecoEgamma/test/ElectronMcSignalHistos.txt b/Validation/RecoEgamma/test/ElectronMcSignalHistos.txt index a50f9c1dbb59e..ef1dfaaba9a03 100644 --- a/Validation/RecoEgamma/test/ElectronMcSignalHistos.txt +++ b/Validation/RecoEgamma/test/ElectronMcSignalHistos.txt @@ -48,9 +48,9 @@ ElectronMcSignalValidator/h_scl_EoEtrue_barrel_new_phigap 1 1 1 0 ElectronMcSignalValidator/h_scl_EoEtrue_ebeegap_new 1 1 1 0 ElectronMcSignalValidator/h_scl_EoEtrue_endcaps_new 1 1 0 0 ElectronMcSignalValidator/h_scl_EoEtrue_endcaps_new_deegap 1 1 1 0 -ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_pfx 1 1 0 0 -ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_barrel_pfx 1 1 0 0 -ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_endcaps_pfx 1 1 1 0 +ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_pfx 0 1 0 0 +ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_barrel_pfx 0 1 0 0 +ElectronMcSignalValidator/h_scl_EoEtrueVsrecOfflineVertices_endcaps_pfx 0 1 1 0 ElectronMcSignalValidator/h_scl_bcl_EtotoEtrue 1 1 0 0 ElectronMcSignalValidator/h_scl_bcl_EtotoEtrue_barrel 1 1 0 0 ElectronMcSignalValidator/h_scl_bcl_EtotoEtrue_endcaps 1 1 1 0 diff --git a/Validation/RecoEgamma/test/ElectronMcSignalPt1000Validation_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalPt1000Validation_cfg.py deleted file mode 100755 index 924434312efd5..0000000000000 --- a/Validation/RecoEgamma/test/ElectronMcSignalPt1000Validation_cfg.py +++ /dev/null @@ -1,44 +0,0 @@ - -import sys -import os -import DQMOffline.EGamma.electronDataDiscovery as dd -import FWCore.ParameterSet.Config as cms - -process = cms.Process("electronValidation") - -process.DQMStore = cms.Service("DQMStore") -process.load("DQMServices.Components.DQMStoreStats_cfi") -from DQMServices.Components.DQMStoreStats_cfi import * -dqmStoreStats.runOnEndJob = cms.untracked.bool(True) - -process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(-1)) -process.source = cms.Source ("PoolSource",fileNames = cms.untracked.vstring(),secondaryFileNames = cms.untracked.vstring()) -process.source.fileNames.extend(dd.search()) - -process.load('Configuration.StandardSequences.Services_cff') -process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') -process.load('FWCore.MessageService.MessageLogger_cfi') -process.load('Configuration.EventContent.EventContent_cff') -process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.StandardSequences.GeometryDB_cff') -process.load('Configuration.StandardSequences.MagneticField_38T_cff') -process.load('Configuration.StandardSequences.RawToDigi_cff') -process.load('Configuration.StandardSequences.Reconstruction_cff') -process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') - -from Configuration.AlCa.autoCond import autoCond -process.GlobalTag.globaltag = autoCond[os.environ['TEST_GLOBAL_AUTOCOND']] -#process.GlobalTag.globaltag = os.environ['TEST_GLOBAL_TAG']+'::All' - -# FOR DATA REDONE FROM RAW, ONE MUST HIDE IsoFromDeps -# CONFIGURATION - -process.load("Validation.RecoEgamma.electronIsoFromDeps_cff") -process.load("Validation.RecoEgamma.ElectronMcSignalPt1000Validator_cfi") - -process.electronMcSignalValidatorPt1000.OutputFile = cms.string(os.environ['TEST_HISTOS_FILE']) - -process.p = cms.Path(process.electronIsoFromDeps*process.electronMcSignalValidatorPt1000*process.dqmStoreStats) - - diff --git a/Validation/RecoEgamma/test/OvalFile b/Validation/RecoEgamma/test/OvalFile index 4eec68abd3e92..688d0a6a6dc57 100644 --- a/Validation/RecoEgamma/test/OvalFile +++ b/Validation/RecoEgamma/test/OvalFile @@ -1,12 +1,12 @@ - - + + - + TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE - + @@ -114,7 +114,6 @@ FullSim - @@ -133,7 +132,6 @@ FullSim - @@ -152,7 +150,6 @@ FullSim - @@ -171,7 +168,6 @@ FullSim - @@ -190,7 +186,6 @@ FullSim - @@ -232,7 +227,6 @@ FullSim - @@ -251,7 +245,6 @@ FullSim - @@ -292,7 +285,6 @@ FullSim - @@ -311,7 +303,6 @@ FullSim - @@ -541,7 +532,6 @@ FullSim - @@ -555,7 +545,6 @@ FullSim - @@ -587,7 +576,6 @@ FullSim - @@ -601,7 +589,6 @@ FullSim - diff --git a/Validation/RecoEgamma/test/OvalFile.FAST b/Validation/RecoEgamma/test/OvalFile.FAST index 93109cc09fd95..734bc350cafc1 100644 --- a/Validation/RecoEgamma/test/OvalFile.FAST +++ b/Validation/RecoEgamma/test/OvalFile.FAST @@ -1,12 +1,12 @@ - - + + - + TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE - + diff --git a/Validation/RecoEgamma/test/OvalFile.GED b/Validation/RecoEgamma/test/OvalFile.GED index f32233ab62cf2..4763917e379d2 100644 --- a/Validation/RecoEgamma/test/OvalFile.GED +++ b/Validation/RecoEgamma/test/OvalFile.GED @@ -1,12 +1,12 @@ - - + + - + TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE - + diff --git a/Validation/RecoEgamma/test/OvalFile.PU b/Validation/RecoEgamma/test/OvalFile.PU index 3d0683b5624bd..98d5c980f467c 100644 --- a/Validation/RecoEgamma/test/OvalFile.PU +++ b/Validation/RecoEgamma/test/OvalFile.PU @@ -1,12 +1,12 @@ - - + + - + TAG for the REFERENCE DATA, USED ONLY FOR INFORMATION ON WEB PAGE - + @@ -174,7 +174,7 @@ FullSim - + @@ -196,7 +196,7 @@ FullSim - +