From fe101877e1bc447de5da4c81a908d4cf6e7c1607 Mon Sep 17 00:00:00 2001 From: Tapio Lampen Date: Thu, 27 Jun 2013 18:33:22 +0000 Subject: [PATCH 1/4] Use notation BPIX/FPIX in plots and files names instead of TPB/TPE. --- .../macros/PlotAlignmentValidation.C | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C b/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C index 378222124c6e7..acca62d524ed5 100644 --- a/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C +++ b/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C @@ -440,8 +440,8 @@ void PlotAlignmentValidation::plotSS( const std::string& options, const std::str TString subDetName; switch (iSubDet) { - case 1: subDetName = "TPB"; break; - case 2: subDetName = "TPE"; break; + case 1: subDetName = "BPIX"; break; + case 2: subDetName = "FPIX"; break; case 3: subDetName = "TIB"; break; case 4: subDetName = "TID"; break; case 5: subDetName = "TOB"; break; @@ -696,8 +696,8 @@ void PlotAlignmentValidation::plotDMR(const std::string& variable, Int_t minHits else if (variable=="rmsNormY") plotName << "rmsNYR_"; switch (i) { - case 1: plotName << "TPB"; break; - case 2: plotName << "TPE"; break; + case 1: plotName << "BPIX"; break; + case 2: plotName << "FPIX"; break; case 3: plotName << "TIB"; break; case 4: plotName << "TID"; break; case 5: plotName << "TOB"; break; @@ -972,8 +972,8 @@ void PlotAlignmentValidation::setTitleStyle( TNamed &hist,const char* titleX, c if (titelXAxis.Contains("rmsX")) histTitel="Distribution of the rms of the residuals in "; switch (subDetId) { - case 1: histTitel+="TPB";break; - case 2: histTitel+="TPE";break; + case 1: histTitel+="BPIX";break; + case 2: histTitel+="FPIX";break; case 3: histTitel+="TIB";break; case 4: histTitel+="TID";break; case 5: histTitel+="TOB";break; From 19012d6c20293e1ad9672aa802fcdd90ba5abbaf Mon Sep 17 00:00:00 2001 From: Tapio Lampen Date: Thu, 27 Jun 2013 19:00:31 +0000 Subject: [PATCH 2/4] Make y-axis exponent visible by increasing space between title and plot. --- Alignment/OfflineValidation/macros/PlotAlignmentValidation.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C b/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C index acca62d524ed5..06c6e78f234c5 100644 --- a/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C +++ b/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C @@ -902,7 +902,7 @@ void PlotAlignmentValidation::setCanvasStyle( TCanvas& canv ) canv.SetLeftMargin ( 0.15 ); canv.SetRightMargin ( 0.05 ); canv.SetBottomMargin( 0.15 ); - canv.SetTopMargin ( 0.10 ); + canv.SetTopMargin ( 0.12 ); } //------------------------------------------------------------------------------ From bc34d232c7215370a5d2693ef4b7b09d6ba7a117 Mon Sep 17 00:00:00 2001 From: Tapio Lampen Date: Fri, 5 Jul 2013 13:45:30 +0000 Subject: [PATCH 3/4] Remove use of triggerBits (creates problems with MC muons). --- .../TkAlAllInOneTool/alternateValidationTemplates.py | 4 ++-- .../python/TkAlAllInOneTool/offlineValidationTemplates.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/alternateValidationTemplates.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/alternateValidationTemplates.py index 4d61965409470..05eb36ff23902 100644 --- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/alternateValidationTemplates.py +++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/alternateValidationTemplates.py @@ -967,7 +967,7 @@ #bit xy for muons trigger -process.triggerSelection=cms.Sequence(process.bptxAnd) +#process.triggerSelection=cms.Sequence(process.bptxAnd) @@ -1415,6 +1415,6 @@ #bit xy for muons trigger -process.triggerSelection=cms.Sequence(process.bptxAnd) +#process.triggerSelection=cms.Sequence(process.bptxAnd) """ diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py index 65de4ae30a589..a322750776d0d 100644 --- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py +++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py @@ -43,7 +43,7 @@ #Good Bunch Crossings process.bptxAnd = process.hltLevel1GTSeed.clone(L1TechTriggerSeeding = cms.bool(True), L1SeedsLogicalExpression = cms.string('0')) #BSCNOBEAMHALO -process.bit40 = process.hltLevel1GTSeed.clone(L1TechTriggerSeeding = cms.bool(True), L1SeedsLogicalExpression = cms.string('(40 OR 41) AND NOT (36 OR 37 OR 38 OR 39) AND NOT ((42 AND NOT 43) OR (43 AND NOT 42))')) +#process.bit40 = process.hltLevel1GTSeed.clone(L1TechTriggerSeeding = cms.bool(True), L1SeedsLogicalExpression = cms.string('(40 OR 41) AND NOT (36 OR 37 OR 38 OR 39) AND NOT ((42 AND NOT 43) OR (43 AND NOT 42))')) #Physics declared process.load('HLTrigger.special.hltPhysicsDeclared_cfi') @@ -189,7 +189,7 @@ ## PATH ## process.p = cms.Path( -process.triggerSelection* +#process.triggerSelection* process.offlineBeamSpot*process.HighPuritySelector*process.TrackRefitter1*process.TrackerTrackHitFilter*process.HitFilteredTracks *process.AlignmentTrackSelector*process.TrackRefitter2*process.seqTrackerOfflineValidation.oO[offlineValidationMode]Oo.) @@ -244,7 +244,7 @@ #Good Bunch Crossings process.bptxAnd = process.hltLevel1GTSeed.clone(L1TechTriggerSeeding = cms.bool(True), L1SeedsLogicalExpression = cms.string('0')) #BSCNOBEAMHALO -process.bit40 = process.hltLevel1GTSeed.clone(L1TechTriggerSeeding = cms.bool(True), L1SeedsLogicalExpression = cms.string('(40 OR 41) AND NOT (36 OR 37 OR 38 OR 39) AND NOT ((42 AND NOT 43) OR (43 AND NOT 42))')) +#process.bit40 = process.hltLevel1GTSeed.clone(L1TechTriggerSeeding = cms.bool(True), L1SeedsLogicalExpression = cms.string('(40 OR 41) AND NOT (36 OR 37 OR 38 OR 39) AND NOT ((42 AND NOT 43) OR (43 AND NOT 42))')) #Physics declared process.load('HLTrigger.special.hltPhysicsDeclared_cfi') @@ -390,7 +390,7 @@ ## PATH ## process.p = cms.Path( -process.triggerSelection* +#process.triggerSelection* process.offlineBeamSpot*process.HighPuritySelector*process.TrackRefitter1*process.TrackerTrackHitFilter*process.HitFilteredTracks *process.AlignmentTrackSelector*process.TrackRefitter2*process.seqTrackerOfflineValidation.oO[offlineValidationMode]Oo.) From 93b1a599db5611315523a2582cde3b55218de891 Mon Sep 17 00:00:00 2001 From: Gregor Hellwig Date: Wed, 7 Aug 2013 15:18:52 +0200 Subject: [PATCH 4/4] Minor bug fix concerning removal of trigger bits. --- .../python/TkAlAllInOneTool/offlineValidationTemplates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py index a322750776d0d..29a85b390aff7 100644 --- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py +++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py @@ -533,7 +533,7 @@ #no triger on bunch crossing bit 0 -process.triggerSelection=cms.Sequence(process.bit40) +# process.triggerSelection=cms.Sequence(process.bit40) """