Merge pull request cms-sw#10004 from hroskes/geometry-comparison-runn…

…umber-75X Backport of cms-sw#10003 - Various All In One Tool bugfixes
hroskes · Sep 1, 2015 · 8d192d3 · 8d192d3
1 parent 196bbd2
commit 8d192d3
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 148 deletions.
diff --git a/Alignment/OfflineValidation/macros/trackSplitPlot.C b/Alignment/OfflineValidation/macros/trackSplitPlot.C
@@ -222,6 +222,10 @@ TCanvas *trackSplitPlot(Int_t nFiles,TString *files,TString *names,TString xvar,
                 x = xint;
             if (xvar == "runNumber")
                 runNumber = x;
+            if (yvar == "phi" && y >= pi)
+                y -= 2*pi;
+            if (yvar == "phi" && y <= -pi)
+                y += 2*pi;
             if ((runNumber < minrun && runNumber > 1) || (runNumber > maxrun && maxrun > 0))  //minrun and maxrun are global variables.
             {
                 notincluded++;
@@ -1912,6 +1916,10 @@ Double_t findStatistic(Statistic what,Int_t nFiles,TString *files,TString var,Ch
                 x = xint;
             if (var == "runNumber")
                 runNumber = x;
+            if (var == "phi" && x >= pi)
+                x -= 2*pi;
+            if (var == "phi" && x <= -pi)
+                x += 2*pi;
             if ((runNumber < minrun && runNumber > 1) || (runNumber > maxrun && maxrun > 0)) continue;
 
             totallength++;

diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/alignment.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/alignment.py
@@ -10,7 +10,17 @@ def __init__(self, name, config, runGeomComp = "1"):
                 {"zeroAPE":{"connectString": ("frontier://FrontierProd"
                                               "/CMS_COND_31X_FROM21X"),
                             "tagName": "TrackerIdealGeometryErrors210_mc",
-                            "labelName": ""}}}
+                            "labelName": ""}
+            },
+            "TrackerSurfaceDeformationRcd": {
+                "zeroDeformations": {
+                    "connectString":("frontier://FrontierProd"
+                                             "/CMS_CONDITIONS"),
+                    "tagName": "TrackerSurfaceDeformations_zero",
+                    "labelName": ""
+                }
+            },
+        }
         section = "alignment:%s"%name
         if not config.has_section( section ):
             raise AllInOneError, ("section %s not found. Please define the "
@@ -23,6 +33,9 @@ def __init__(self, name, config, runGeomComp = "1"):
             self.title = config.get(section,"title")
         else:
             self.title = self.name
+        if (int(runGeomComp) != 1):
+            self.name += "_run" + runGeomComp
+            self.title += " run " + runGeomComp
         if "|" in self.title or "," in self.title or '"' in self.title:
             msg = "The characters '|', '\"', and ',' cannot be used in the alignment title!"
             raise AllInOneError(msg)

diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/alternateValidationTemplates.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/alternateValidationTemplates.py
@@ -77,15 +77,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -157,7 +149,7 @@
  ##
  ## Magnetic Field
  ##
-process.load("Configuration/StandardSequences/MagneticField_.oO[magneticField]Oo._cff")
+process.load("Configuration/StandardSequences/.oO[magneticField]Oo._cff")
 
 .oO[condLoad]Oo.
 
@@ -303,7 +295,7 @@
 ##
 ## Magnetic Field
 ##
-process.load("Configuration/StandardSequences/MagneticField_.oO[magneticField]Oo._cff")
+process.load("Configuration/StandardSequences/.oO[magneticField]Oo._cff")
 
 .oO[LorentzAngleTemplate]Oo.
   
@@ -459,7 +451,7 @@
  ##
  ## Magnetic Field
  ##
-process.load("Configuration.StandardSequences.MagneticField_.oO[magneticField]Oo._cff")
+process.load("Configuration.StandardSequences..oO[magneticField]Oo._cff")
 
 .oO[condLoad]Oo.
 
@@ -517,15 +509,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -587,15 +571,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -658,15 +634,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -729,15 +697,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -800,15 +760,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -853,16 +805,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -916,15 +859,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -1048,7 +983,7 @@
  ##
  ## Magnetic Field
  ##
-process.load("Configuration/StandardSequences/MagneticField_.oO[magneticField]Oo._cff")
+process.load("Configuration/StandardSequences/.oO[magneticField]Oo._cff")
 
 .oO[condLoad]Oo.
 
@@ -1131,15 +1066,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -1209,15 +1136,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -1290,16 +1209,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True
@@ -1364,15 +1274,7 @@
 process.TrackerTrackHitFilter.useTrajectories= True  # this is needed only if you require some selections; but it will work even if you don't ask for them
 process.TrackerTrackHitFilter.minimumHits = 8
 process.TrackerTrackHitFilter.commands = cms.vstring("keep PXB","keep PXE","keep TIB","keep TID","keep TOB","keep TEC")
-process.TrackerTrackHitFilter.detsToIgnore = [
-     # see https://hypernews.cern.ch/HyperNews/CMS/get/tracker-performance/484.html
-    # TIB / TID
-    #369136710, 369136714, 402668822,
-    # TOB
-    #436310989, 436310990, 436299301, 436299302,
-    # TEC
-    #470340521, 470063045, 470063046, 470114669, 470114670, 470161093, 470161094, 470164333, 470164334, 470312005, 470312006, 470312009, 470067405, 470067406, 470128813
-]
+process.TrackerTrackHitFilter.detsToIgnore = []
 process.TrackerTrackHitFilter.replaceWithInactiveHits = True
 process.TrackerTrackHitFilter.stripAllInvalidHits = False
 process.TrackerTrackHitFilter.rejectBadStoNHits = True