Skip to content

Commit

Permalink
Merge pull request #3811 from HuguesBrun/shortenDirectoriesNameFor710…
Browse files Browse the repository at this point in the history 
…pre8

DQM -- Shorten folders name for710pre8
  • Loading branch information
@ktf
ktf committed May 12, 2014
2 parents 5f872de + 444b985 commit 1bf40ef
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
14 changes: 8 additions & 6 deletions Validation/RecoMuon/plugins/MuonTrackValidator.cc
View file
Expand Up @@ -39,17 +39,19 @@ void MuonTrackValidator::bookHistograms(DQMStore::IBooker& ibooker, edm::Run con
if (algo.process()!="")
dirName+=algo.process()+"_";
if(algo.label()!="")
dirName+=algo.label()+"_";
dirName+=algo.label();
if(algo.instance()!="")
dirName+=algo.instance()+"_";
dirName+=("_"+algo.instance());
if (dirName.find("Tracks")<dirName.length()){
dirName.replace(dirName.find("Tracks"),6,"");
dirName.replace(dirName.find("Tracks"),6,"Trks");
}
if (dirName.find("UpdatedAtVtx")<dirName.length()){
dirName.replace(dirName.find("UpdatedAtVtx"),12,"UpdAtVtx");
}
string assoc= associators[ww];
if (assoc.find("Track")<assoc.length()){
assoc.replace(assoc.find("Track"),5,"");
if (assoc.find("tpToTkmuTrackAssociation")<assoc.length()){
dirName+="_TkAsso";
}
dirName+=assoc;
std::replace(dirName.begin(), dirName.end(), ':', '_');
ibooker.setCurrentFolder(dirName.c_str());

Expand Down
12 changes: 6 additions & 6 deletions Validation/RecoMuon/python/PostProcessorHLT_cff.py
View file
Expand Up @@ -52,12 +52,12 @@
"DQMGenericClient",
subDirs = cms.untracked.vstring("HLT/Muon/MultiTrack/"),
efficiency = cms.vstring(
"Eff_L3Tk_Eta_mabh 'Eff_{L3,TK} vs #eta' hltL3Muons_tpToL3MuonAssociation/effic hltL3TkFromL2_tpToL3TkMuonAssociation/effic",
"Eff_L3Tk_Pt_mabh 'Eff_{L3,TK} vs p_{T}' hltL3Muons_tpToL3MuonAssociation/efficPt hltL3TkFromL2_tpToL3TkMuonAssociation/efficPt",
"Eff_L3Tk_Hit_mabh 'Eff_{L3,TK} vs n Hits' hltL3Muons_tpToL3MuonAssociation/effic_vs_hit hltL3TkFromL2_tpToL3TkMuonAssociation/effic_vs_hit",
"Eff_L3L2_Eta_mabh 'Eff_{L3,L2} vs #eta' hltL3Muons_tpToL3MuonAssociation/effic hltL2Muons_UpdatedAtVtx_tpToL2UpdMuonAssociation/effic",
"Eff_L3L2_Pt_mabh 'Eff_{L3,L2} vs p_{T}' hltL3Muons_tpToL3MuonAssociation/efficPt hltL2Muons_UpdatedAtVtx_tpToL2UpdMuonAssociation/efficPt",
"Eff_L3L2_Hit_mabh 'Eff_{L3,L2} vs n Hits' hltL3Muons_tpToL3MuonAssociation/effic_vs_hit hltL2Muons_UpdatedAtVtx_tpToL2UpdMuonAssociation/effic_vs_hit",
"Eff_L3Tk_Eta_mabh 'Eff_{L3,TK} vs #eta' hltL3Muons/effic hltL3TkFromL2/effic",
"Eff_L3Tk_Pt_mabh 'Eff_{L3,TK} vs p_{T}' hltL3Muons/efficPt hltL3TkFromL2/efficPt",
"Eff_L3Tk_Hit_mabh 'Eff_{L3,TK} vs n Hits' hltL3Muons/effic_vs_hit hltL3TkFromL2/effic_vs_hit",
"Eff_L3L2_Eta_mabh 'Eff_{L3,L2} vs #eta' hltL3Muons/effic hltL2Muons_UpdAtVtx/effic",
"Eff_L3L2_Pt_mabh 'Eff_{L3,L2} vs p_{T}' hltL3Muons/efficPt hltL2Muons_UpdAtVtx/efficPt",
"Eff_L3L2_Hit_mabh 'Eff_{L3,L2} vs n Hits' hltL3Muons/effic_vs_hit hltL2Muons_UpdAtVtx/effic_vs_hit",
),
resolution = cms.vstring(""),
outputFileName = cms.untracked.string("")
Expand Down
24 changes: 12 additions & 12 deletions Validation/RecoMuon/python/PostProcessor_cff.py
View file
Expand Up @@ -52,12 +52,12 @@
postProcessorMuonMultiTrackComp = cms.EDAnalyzer("DQMGenericClient",
subDirs = cms.untracked.vstring("Muons/RecoMuonV/MultiTrack/"),
efficiency = cms.vstring(
"Eff_GlbTk_Eta_mabh 'Eff_{GLB,TK} vs #eta' extractedGlobalMuons_tpToGlbMuonAssociation/effic general_tpToTkmuAssociation/effic",
"Eff_GlbTk_Pt_mabh 'Eff_{GLB,TK} vs p_{T}' extractedGlobalMuons_tpToGlbMuonAssociation/efficPt general_tpToTkmuAssociation/efficPt",
"Eff_GlbTk_Hit_mabh 'Eff_{GLB,TK} vs n Hits' extractedGlobalMuons_tpToGlbMuonAssociation/effic_vs_hit general_tpToTkmuAssociation/effic_vs_hit",
"Eff_GlbSta_Eta_mabh 'Eff_{GLB,STA} vs #eta' extractedGlobalMuons_tpToGlbMuonAssociation/effic standAloneMuons_UpdatedAtVtx_tpToStaUpdMuonAssociation/effic",
"Eff_GlbSta_Pt_mabh 'Eff_{GLB,STA} vs p_{T}' extractedGlobalMuons_tpToGlbMuonAssociation/efficPt standAloneMuons_UpdatedAtVtx_tpToStaUpdMuonAssociation/efficPt",
"Eff_GlbSta_Hit_mabh 'Eff_{GLB,STA} vs n Hits' extractedGlobalMuons_tpToGlbMuonAssociation/effic_vs_hit standAloneMuons_UpdatedAtVtx_tpToStaUpdMuonAssociation/effic_vs_hit",
"Eff_GlbTk_Eta_mabh 'Eff_{GLB,TK} vs #eta' extractedGlobalMuons/effic probeTrks/effic",
"Eff_GlbTk_Pt_mabh 'Eff_{GLB,TK} vs p_{T}' extractedGlobalMuons/efficPt probeTrks/efficPt",
"Eff_GlbTk_Hit_mabh 'Eff_{GLB,TK} vs n Hits' extractedGlobalMuons/effic_vs_hit probeTrks/effic_vs_hit",
"Eff_GlbSta_Eta_mabh 'Eff_{GLB,STA} vs #eta' extractedGlobalMuons/effic standAloneMuons_UpdAtVtx/effic",
"Eff_GlbSta_Pt_mabh 'Eff_{GLB,STA} vs p_{T}' extractedGlobalMuons/efficPt standAloneMuons_UpdAtVtx/efficPt",
"Eff_GlbSta_Hit_mabh 'Eff_{GLB,STA} vs n Hits' extractedGlobalMuons/effic_vs_hit standAloneMuons_UpdAtVtx/effic_vs_hit",
),
resolution = cms.vstring(""),
outputFileName = cms.untracked.string("")
Expand All @@ -66,12 +66,12 @@
postProcessorMuonMultiTrackCompFS = cms.EDAnalyzer("DQMGenericClient",
subDirs = cms.untracked.vstring("Muons/RecoMuonV/MultiTrack/"),
efficiency = cms.vstring(
"Eff_GlbTk_Eta_mabh 'Eff_{GLB,TK} vs #eta' extractedGlobalMuons_tpToGlbMuonAssociationFS/effic general_tpToTkmuAssociationFS/effic",
"Eff_GlbTk_Pt_mabh 'Eff_{GLB,TK} vs p_{T}' extractedGlobalMuons_tpToGlbMuonAssociationFS/efficPt general_tpToTkmuAssociationFS/efficPt",
"Eff_GlbTk_Hit_mabh 'Eff_{GLB,TK} vs n Hits' extractedGlobalMuons_tpToGlbMuonAssociationFS/effic_vs_hit general_tpToTkmuAssociationFS/effic_vs_hit",
"Eff_GlbSta_Eta_mabh 'Eff_{GLB,STA} vs #eta' extractedGlobalMuons_tpToGlbMuonAssociationFS/effic standAloneMuons_UpdatedAtVtx_tpToStaUpdMuonAssociationFS/effic",
"Eff_GlbSta_Pt_mabh 'Eff_{GLB,STA} vs p_{T}' extractedGlobalMuons_tpToGlbMuonAssociationFS/efficPt standAloneMuons_UpdatedAtVtx_tpToStaUpdMuonAssociationFS/efficPt",
"Eff_GlbSta_Hit_mabh 'Eff_{GLB,STA} vs n Hits' extractedGlobalMuons_tpToGlbMuonAssociationFS/effic_vs_hit standAloneMuons_UpdatedAtVtx_tpToStaUpdMuonAssociationFS/effic_vs_hit",
"Eff_GlbTk_Eta_mabh 'Eff_{GLB,TK} vs #eta' extractedGlobalMuons/effic probeTrks/effic",
"Eff_GlbTk_Pt_mabh 'Eff_{GLB,TK} vs p_{T}' extractedGlobalMuons/efficPt probeTrks/efficPt",
"Eff_GlbTk_Hit_mabh 'Eff_{GLB,TK} vs n Hits' extractedGlobalMuons/effic_vs_hit probeTrks/effic_vs_hit",
"Eff_GlbSta_Eta_mabh 'Eff_{GLB,STA} vs #eta' extractedGlobalMuons/effic standAloneMuons_UpdAtVtx/effic",
"Eff_GlbSta_Pt_mabh 'Eff_{GLB,STA} vs p_{T}' extractedGlobalMuons/efficPt standAloneMuons_UpdAtVtx/efficPt",
"Eff_GlbSta_Hit_mabh 'Eff_{GLB,STA} vs n Hits' extractedGlobalMuons/effic_vs_hit standAloneMuons_UpdAtVtx/effic_vs_hit",
),
resolution = cms.vstring(""),
outputFileName = cms.untracked.string("")
Expand Down

0 comments on commit 1bf40ef

Please sign in to comment.