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.

Sign up for GitHub

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

Jump to bottom

Remove statics v4 #2885

Merged
merged 23 commits into from Apr 13, 2014
Merged

Remove statics v4 #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d1e479e
removing old unused modules
Mar 1, 2014
3e42b57
make PFGeometry a normal class and drop unused variables
davidlange6 Mar 14, 2014
38a24f0
remove code I had commented out
davidlange6 Mar 14, 2014
11329bf
Add new function to save pileup information for accumulators
mdhildreth Mar 15, 2014
cd5a125
different implentation of virtual functions for pileup information
mdhildreth Mar 15, 2014
a7aeca7
updating merge
davidlange6 Mar 17, 2014
6a11976
typo
felicepantaleo Mar 17, 2014
d45a39f
Minor code modifications
dnikolop Mar 18, 2014
2132b5e
Remove TYPELOOKUP_DATA_REG(SeedingLayerSetsBuilder) as obsolete
makortel Mar 18, 2014
960d7ab
pu scenario for CSA14, based on FastSimulation/PileUpProducer
Mar 19, 2014
b121ab4
remove the import in MuonOffline_Trigger_cff.py
Mar 19, 2014
c545064
remove the old sequence in MuonOffline_Trigger_cff.py
Mar 19, 2014
1e8b493
add check on the axis labels when merging
deguio Mar 20, 2014
bf75673
using strcmp to compare strings
deguio Mar 20, 2014
447cb6b
Merge pull request #2905 from felicepantaleo/TrackClusterSplitterTypo
ktf Mar 21, 2014
d0485b1
Merge pull request #2919 from makortel/seedingLayersFix
ktf Mar 21, 2014
a888ba3
Merge pull request #2929 from ebouvier/cleaning
nclopezo Mar 21, 2014
4c4b2a8
Merge pull request #2915 from dnikolop/performance-scripts
nclopezo Mar 21, 2014
ed068da
Merge pull request #2947 from deguio/checkAxisLabels
nclopezo Mar 21, 2014
2403a0c
Merge pull request #2953 from mdhildreth/Mixing_save_PileupInfo_for_D…
nclopezo Mar 21, 2014
cea2c3e
Merge pull request #2932 from lveldere/fastsim-CSA14-pu-profile
nclopezo Mar 21, 2014
acb0d0a
Merge pull request #2955 from Martin-Grunewald/RRapiToolsUpdate
nclopezo Mar 21, 2014
95a797d
fix merge conflict
davidlange6 Mar 23, 2014
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: 1 addition & 1 deletion Configuration/StandardSequences/python/Mixing.py
View file
Open in desktop
Expand Up @@ -108,7 +108,7 @@ def addMixingScenario(label,dict):
addMixingScenario("FS_2012_Summer_inTimeOnly",{'file': 'FastSimulation.PileUpProducer.PileUpSimulator_2012_Summer_inTimeOnly_cff'})
addMixingScenario("FS_mix_2012_Startup_inTimeOnly",{'file': 'FastSimulation.PileUpProducer.mix_2012_Startup_inTimeOnly_cff'})
addMixingScenario("FS_mix_2012_Summer_inTimeOnly",{'file': 'FastSimulation.PileUpProducer.mix_2012_Summer_inTimeOnly_cff'})

addMixingScenario("FS_CSA14_inTimeOnly",{'file': 'FastSimulation.PileUpProducer.PileUpSimulator_CSA14_inTimeOnly_cff'})

#scenarios for L1 tdr work
addMixingScenario("AVE_10_BX_25ns",{'file': 'SimGeneral.MixingModule.mix_POISSON_average_cfi','BX':25, 'B': (-12,3), 'N': 10})
Expand Down
148 changes: 0 additions & 148 deletions DQMOffline/Trigger/interface/TopHLTDiMuonDQM.h
View file
Open in desktop

This file was deleted.

69 changes: 0 additions & 69 deletions DQMOffline/Trigger/interface/TopHLTDiMuonDQMClient.h
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions DQMOffline/Trigger/python/DQMOffline_HLT_Client_cff.py
View file
Open in desktop
Expand Up @@ -10,7 +10,6 @@
#from DQMOffline.Trigger.TnPEfficiencyPostProcessor_cff import *
from DQMOffline.Trigger.HLTTauPostProcessor_cfi import *
from DQMOffline.Trigger.DQMOffline_HLT_Cert_cff import *
from DQMOffline.Trigger.topHLTDiMuonDQMClient_cfi import *
from DQMOffline.Trigger.HLTInclusiveVBFClient_cfi import *

hltOfflineDQMClient = cms.Sequence(
Expand All @@ -21,9 +20,6 @@
#tagAndProbeEfficiencyPostProcessor *
HLTTauPostSeq *
dqmOfflineHLTCert *
topHLTDiMuonClient *
hltInclusiveVBFClient
)

# Temporary remove until fixed
hltOfflineDQMClient.remove(topHLTDiMuonClient)
2 changes: 0 additions & 2 deletions DQMOffline/Trigger/python/MuonOffline_Trigger_cff.py
View file
Open in desktop
@@ -1,9 +1,7 @@
import FWCore.ParameterSet.Config as cms

from DQMOffline.Trigger.HLTMuonOfflineAnalyzer_cff import *
from DQMOffline.Trigger.topHLTDiMuonDQM_cfi import *

muonFullOfflineDQM = cms.Sequence(
hltMuonOfflineAnalyzers
+ topHLTDiMuonAnalyzer
)
9 changes: 0 additions & 9 deletions DQMOffline/Trigger/python/topHLTDiMuonDQMClient_cfi.py
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions DQMOffline/Trigger/python/topHLTDiMuonDQM_cfi.py
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions DQMOffline/Trigger/src/SealModule.cc
View file
Open in desktop
Expand Up @@ -13,8 +13,6 @@
#include "DQMOffline/Trigger/interface/BTagHLTOfflineClient.h"
#include "DQMOffline/Trigger/interface/DQMOfflineHLTEventInfoClient.h"
#include "DQMOffline/Trigger/interface/HLTTauCertifier.h"
#include "DQMOffline/Trigger/interface/TopHLTDiMuonDQM.h"
#include "DQMOffline/Trigger/interface/TopHLTDiMuonDQMClient.h"
#include "DQMOffline/Trigger/interface/HLTInclusiveVBFSource.h"
#include "DQMOffline/Trigger/interface/HLTInclusiveVBFClient.h"
#include "DQMOffline/Trigger/interface/TopDiLeptonHLTOfflineDQM.h"
Expand All @@ -35,8 +33,6 @@ DEFINE_FWK_MODULE(BTagHLTOfflineSource);
DEFINE_FWK_MODULE(BTagHLTOfflineClient);
DEFINE_FWK_MODULE(DQMOfflineHLTEventInfoClient);
DEFINE_FWK_MODULE(HLTTauCertifier);
DEFINE_FWK_MODULE(TopHLTDiMuonDQM);
DEFINE_FWK_MODULE(TopHLTDiMuonDQMClient);
DEFINE_FWK_MODULE(HLTInclusiveVBFSource);
DEFINE_FWK_MODULE(HLTInclusiveVBFClient);
DEFINE_FWK_MODULE(TopDiLeptonHLTOfflineDQM);
Expand Down