Merge branch 'from-CMSSW_9_1_X_2017-04-24-1100' into CMSSW_9_1_X_tau-…

…pog_miniAOD-tauMVAs

Alignment/APEEstimation/plugins/ApeEstimator.cc

@@ -50,7 +50,6 @@
 #include "DataFormats/TrackerRecHit2D/interface/ProjectedSiStripRecHit2D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
-//#include "DataFormats/GeometrySurface/interface/LocalError.h" // which one of LocalError.h to include ?
 #include "DataFormats/GeometryCommonDetAlgo/interface/LocalError.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementPoint.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementError.h"
@@ -267,8 +266,8 @@ ApeEstimator::sectorBuilder(){
     return;
   }
   UInt_t rawId(999), subdetId(999), layer(999), side(999), half(999), rod(999), ring(999), petal(999),
-         blade(999), panel(999), outerInner(999), module(999), rodAl(999), bladeAl(999), nStrips(999);
-  Bool_t isDoubleSide(false), isRPhi(false);
+         blade(999), panel(999), outerInner(999), module(999), nStrips(999);
+  Bool_t isDoubleSide(false), isRPhi(false), isStereo(false);
   Int_t uDirection(999), vDirection(999), wDirection(999);
   Float_t posR(999.F), posPhi(999.F), posEta(999.F), posX(999.F), posY(999.F), posZ(999.F); 
   tkTree->SetBranchAddress("RawId", &rawId);
@@ -283,11 +282,10 @@ ApeEstimator::sectorBuilder(){
   tkTree->SetBranchAddress("Panel", &panel);
   tkTree->SetBranchAddress("OuterInner", &outerInner);
   tkTree->SetBranchAddress("Module", &module);
-  tkTree->SetBranchAddress("RodAl", &rodAl);
-  tkTree->SetBranchAddress("BladeAl", &bladeAl);
   tkTree->SetBranchAddress("NStrips", &nStrips);
   tkTree->SetBranchAddress("IsDoubleSide", &isDoubleSide);
   tkTree->SetBranchAddress("IsRPhi", &isRPhi);
+  tkTree->SetBranchAddress("IsStereo", &isStereo);
   tkTree->SetBranchAddress("UDirection", &uDirection);
   tkTree->SetBranchAddress("VDirection", &vDirection);
   tkTree->SetBranchAddress("WDirection", &wDirection);
@@ -321,11 +319,10 @@ ApeEstimator::sectorBuilder(){
 			      v_panel(parSet.getParameter<std::vector<unsigned int> >("panel")),
 			      v_outerInner(parSet.getParameter<std::vector<unsigned int> >("outerInner")),
 			      v_module(parSet.getParameter<std::vector<unsigned int> >("module")),
-			      v_rodAl(parSet.getParameter<std::vector<unsigned int> >("rodAl")),
-			      v_bladeAl(parSet.getParameter<std::vector<unsigned int> >("bladeAl")),
 			      v_nStrips(parSet.getParameter<std::vector<unsigned int> >("nStrips")),
 			      v_isDoubleSide(parSet.getParameter<std::vector<unsigned int> >("isDoubleSide")),
-			      v_isRPhi(parSet.getParameter<std::vector<unsigned int> >("isRPhi"));
+			      v_isRPhi(parSet.getParameter<std::vector<unsigned int> >("isRPhi")),
+			      v_isStereo(parSet.getParameter<std::vector<unsigned int> >("isStereo"));
     std::vector<int> v_uDirection(parSet.getParameter<std::vector<int> >("uDirection")),
                      v_vDirection(parSet.getParameter<std::vector<int> >("vDirection")),
 		     v_wDirection(parSet.getParameter<std::vector<int> >("wDirection"));
@@ -371,11 +368,10 @@ ApeEstimator::sectorBuilder(){
       if(!this->checkModuleIds(panel,v_panel))continue;
       if(!this->checkModuleIds(outerInner,v_outerInner))continue;
       if(!this->checkModuleIds(module,v_module))continue;
-      if(!this->checkModuleIds(rodAl,v_rodAl))continue;
-      if(!this->checkModuleIds(bladeAl,v_bladeAl))continue;
       if(!this->checkModuleIds(nStrips,v_nStrips))continue;
       if(!this->checkModuleBools(isDoubleSide,v_isDoubleSide))continue;
       if(!this->checkModuleBools(isRPhi,v_isRPhi))continue;
+      if(!this->checkModuleBools(isStereo,v_isStereo))continue;
       if(!this->checkModuleDirections(uDirection,v_uDirection))continue;
       if(!this->checkModuleDirections(vDirection,v_vDirection))continue;
       if(!this->checkModuleDirections(wDirection,v_wDirection))continue;

Alignment/APEEstimation/python/SectorBuilder_Bpix_Phase0_cff.py

@@ -0,0 +1,97 @@
+import FWCore.ParameterSet.Config as cms
+
+from Alignment.APEEstimation.SectorBuilder_cfi import *
+
+
+
+##
+## Whole Subdetector
+##
+
+Bpix = EmptySector.clone(
+    name = 'Bpix',
+    subdetId = [1],
+)
+
+BPIX = cms.VPSet(
+    Bpix,
+)
+
+
+
+##
+## Separation of layers
+##
+
+BpixLayer1 = Bpix.clone(
+    name = 'BpixLayer1',
+    layer = [1],
+)
+BpixLayer2 = Bpix.clone(
+    name = 'BpixLayer2',
+    layer = [2],
+)
+BpixLayer3 = Bpix.clone(
+    name = 'BpixLayer3',
+    layer = [3],
+)
+
+BPIXLayerSeparation = cms.VPSet(
+    BpixLayer1,
+    BpixLayer2,
+    BpixLayer3,
+)
+
+
+
+##
+## Separation of layers + orientations
+##
+
+BpixLayer1Out = BpixLayer1.clone(
+    name = 'BpixLayer1Out',
+    wDirection = [1],
+)
+BpixLayer1In = BpixLayer1.clone(
+    name = 'BpixLayer1In',
+    wDirection = [-1],
+)
+BpixLayer2Out = BpixLayer2.clone(
+    name = 'BpixLayer2Out',
+    wDirection = [1],
+)
+BpixLayer2In = BpixLayer2.clone(
+    name = 'BpixLayer2In',
+    wDirection = [-1],
+)
+BpixLayer3Out = BpixLayer3.clone(
+    name = 'BpixLayer3Out',
+    wDirection = [1],
+)
+BpixLayer3In = BpixLayer3.clone(
+    name = 'BpixLayer3In',
+    wDirection = [-1],
+)
+
+BPIXLayerAndOrientationSeparation = cms.VPSet(
+    BpixLayer1Out,
+    BpixLayer1In,
+    BpixLayer2Out,
+    BpixLayer2In,
+    BpixLayer3Out,
+    BpixLayer3In,
+)
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Alignment/APEEstimation/python/SectorBuilder_Bpix_cff.py

@@ -35,11 +35,16 @@
     name = 'BpixLayer3',
     layer = [3],
 )
+BpixLayer4 = Bpix.clone(
+    name = 'BpixLayer4',
+    layer = [4],
+)
 
 BPIXLayerSeparation = cms.VPSet(
     BpixLayer1,
     BpixLayer2,
     BpixLayer3,
+    BpixLayer4,
 )
 
 
@@ -72,6 +77,14 @@
     name = 'BpixLayer3In',
     wDirection = [-1],
 )
+BpixLayer4Out = BpixLayer4.clone(
+    name = 'BpixLayer4Out',
+    wDirection = [1],
+)
+BpixLayer4In = BpixLayer4.clone(
+    name = 'BpixLayer4In',
+    wDirection = [-1],
+)
 
 BPIXLayerAndOrientationSeparation = cms.VPSet(
     BpixLayer1Out,
@@ -80,6 +93,8 @@
     BpixLayer2In,
     BpixLayer3Out,
     BpixLayer3In,
+    BpixLayer4Out,
+    BpixLayer4In,
 )
 
 

Alignment/APEEstimation/python/SectorBuilder_Fpix_Phase0_cff.py

@@ -0,0 +1,126 @@
+import FWCore.ParameterSet.Config as cms
+
+from Alignment.APEEstimation.SectorBuilder_cfi import *
+
+
+
+##
+## Whole Subdetector (means only one for both endcaps)
+##
+
+Fpix = EmptySector.clone(
+    name = 'Fpix',
+    subdetId = [2],
+)
+
+FPIX = cms.VPSet(
+    Fpix,
+)
+
+
+
+##
+## Separation of side(+,-)
+##
+
+FpixMinus = Fpix.clone(
+    name = 'FpixMinus',
+    side = [1],
+)
+FpixPlus = Fpix.clone(
+    name = 'FpixPlus',
+    side = [2],
+)
+
+FPIXSideSeparation = cms.VPSet(
+    FpixMinus,
+    FpixPlus,
+)
+
+
+
+##
+## Separation of side + layers
+##
+
+FpixMinusLayer1 = FpixMinus.clone(
+    name = 'FpixMinusLayer1',
+    layer = [1],
+)
+FpixMinusLayer2 = FpixMinus.clone(
+    name = 'FpixMinusLayer2',
+    layer = [2],
+)
+FpixPlusLayer1 = FpixPlus.clone(
+    name = 'FpixPlusLayer1',
+    layer = [1],
+)
+FpixPlusLayer2 = FpixPlus.clone(
+    name = 'FpixPlusLayer2',
+    layer = [2],
+)
+
+FPIXSideAndLayerSeparation = cms.VPSet(
+    FpixMinusLayer1,
+    FpixMinusLayer2,
+    FpixPlusLayer1,
+    FpixPlusLayer2,
+)
+
+
+
+##
+## Separation of side + layers + orientations
+##
+
+FpixMinusLayer1Out = FpixMinusLayer1.clone(
+    name = 'FpixMinusLayer1Out',
+    wDirection = [-1],
+)
+FpixMinusLayer1In = FpixMinusLayer1.clone(
+    name = 'FpixMinusLayer1In',
+    wDirection = [1],
+)
+FpixMinusLayer2Out = FpixMinusLayer2.clone(
+    name = 'FpixMinusLayer2Out',
+    wDirection = [-1],
+)
+FpixMinusLayer2In = FpixMinusLayer2.clone(
+    name = 'FpixMinusLayer2In',
+    wDirection = [1],
+)
+FpixPlusLayer1Out = FpixPlusLayer1.clone(
+    name = 'FpixPlusLayer1Out',
+    wDirection = [1],
+)
+FpixPlusLayer1In = FpixPlusLayer1.clone(
+    name = 'FpixPlusLayer1In',
+    wDirection = [-1],
+)
+FpixPlusLayer2Out = FpixPlusLayer2.clone(
+    name = 'FpixPlusLayer2Out',
+    wDirection = [1],
+)
+FpixPlusLayer2In = FpixPlusLayer2.clone(
+    name = 'FpixPlusLayer2In',
+    wDirection = [-1],
+)
+
+FPIXSideAndLayerAndOrientationSeparation = cms.VPSet(
+    FpixMinusLayer1Out,
+    FpixMinusLayer1In,
+    FpixMinusLayer2Out,
+    FpixMinusLayer2In,
+    FpixPlusLayer1Out,
+    FpixPlusLayer1In,
+    FpixPlusLayer2Out,
+    FpixPlusLayer2In,
+)
+
+
+
+
+
+
+
+

Alignment/APEEstimation/python/SectorBuilder_Fpix_cff.py

@@ -51,6 +51,10 @@
     name = 'FpixMinusLayer2',
     layer = [2],
 )
+FpixMinusLayer3 = FpixMinus.clone(
+    name = 'FpixMinusLayer3',
+    layer = [3],
+)
 FpixPlusLayer1 = FpixPlus.clone(
     name = 'FpixPlusLayer1',
     layer = [1],
@@ -59,12 +63,18 @@
     name = 'FpixPlusLayer2',
     layer = [2],
 )
+FpixPlusLayer3 = FpixPlus.clone(
+    name = 'FpixPlusLayer3',
+    layer = [3],
+)
 
 FPIXSideAndLayerSeparation = cms.VPSet(
     FpixMinusLayer1,
     FpixMinusLayer2,
+    FpixMinusLayer3,
     FpixPlusLayer1,
     FpixPlusLayer2,
+    FpixPlusLayer3,
 )
 
 
@@ -89,6 +99,14 @@
     name = 'FpixMinusLayer2In',
     wDirection = [1],
 )
+FpixMinusLayer3Out = FpixMinusLayer3.clone(
+    name = 'FpixMinusLayer3Out',
+    wDirection = [-1],
+)
+FpixMinusLayer3In = FpixMinusLayer3.clone(
+    name = 'FpixMinusLayer3In',
+    wDirection = [1],
+)
 FpixPlusLayer1Out = FpixPlusLayer1.clone(
     name = 'FpixPlusLayer1Out',
     wDirection = [1],
@@ -105,16 +123,28 @@
     name = 'FpixPlusLayer2In',
     wDirection = [-1],
 )
+FpixPlusLayer3Out = FpixPlusLayer3.clone(
+    name = 'FpixPlusLayer3Out',
+    wDirection = [1],
+)
+FpixPlusLayer3In = FpixPlusLayer3.clone(
+    name = 'FpixPlusLayer3In',
+    wDirection = [-1],
+)
 
 FPIXSideAndLayerAndOrientationSeparation = cms.VPSet(
     FpixMinusLayer1Out,
     FpixMinusLayer1In,
     FpixMinusLayer2Out,
     FpixMinusLayer2In,
+    FpixMinusLayer3Out,
+    FpixMinusLayer3In,
     FpixPlusLayer1Out,
     FpixPlusLayer1In,
     FpixPlusLayer2Out,
     FpixPlusLayer2In,
+    FpixPlusLayer3Out,
+    FpixPlusLayer3In,
 )