Merge pull request #702 from ghellwig/update_AllInOne-Tool_to_current…

…-70X-version

Update all in one tool to current 70X version

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;
@@ -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 );
 }
 
 //------------------------------------------------------------------------------
@@ -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;

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)
 
 """

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.)
 
@@ -533,7 +533,7 @@
 #no triger on bunch crossing bit 0
 
 
-process.triggerSelection=cms.Sequence(process.bit40)
+# process.triggerSelection=cms.Sequence(process.bit40)
 
 """
 

Alignment/OfflineValidation/test/InputSource.dat

@@ -1,9 +1,15 @@
-jobname TryReco
-datasetpath DATA_RecoMinBias900GeV_cff
-globaltag GR09_R_34X_V2::All
-alignobj frontier://FrontierArc/CMS_COND_31X_ALIGNMENT_0912
-taggeom TrackerAlignment_2009_v5_offline
-apeobj sqlite_file:/afs/cern.ch/user/m/musich/public/moduleDepenentAPE/SafeAPEforFirstCollisions.db
-tagape AlignmentErrors
-tracktype generalTracks
-outfile TryPVValidation_Reco_Data900GeV.root
+jobname PVValidation
+isda False
+applybows True
+applycorrs False
+datasetpath PVValidation_Example_cff
+maxevents 20000
+globaltag GR_E_V25::All
+alignobj frontier://PromptProd/CMS_COND_31X_ALIGNMENT
+taggeom TrackerAlignment_2009_v1_express
+bowsobj frontier://PromptProd/CMS_COND_310X_ALIGN
+tagbows TrackerSurafceDeformations_v1_express
+apeobj frontier://PromptProd/CMS_COND_31X_ALIGNMENT
+tagape TrackerAlignmentErr_2009_v2_express
+tracktype ALCARECOTkAlMinBias
+outfile PVValidation.root