Merge branch 'CMSSW_7_5_X' of https://github.com/cms-sw/cmssw into CM…

…SSW_7_5_X_sherpa_RelVal

Alignment/OfflineValidation/python/tools/trackselectionRefitting.py → Alignment/CommonAlignment/python/tools/trackselectionRefitting.py

@@ -9,6 +9,7 @@ def getSequence(process, collection,
                 usePixelQualityFlag = True,
                 openMassWindow = False,
                 cosmicsDecoMode = False,
+                cosmicsZeroTesla = True,
                 momentumConstraint = None):
     """This function returns a cms.Sequence containing as last element the
     module 'FinalTrackRefitter', which can be used as cms.InputTag for
@@ -28,6 +29,7 @@ def getSequence(process, collection,
     - `usePixelQualityFlag`: Option used for the TrackHitFilter module.
     - `openMassWindow`: Used to configure the TwoBodyDecaySelector for ZMuMu.
     - `cosmicsDecoMode`: If set to 'True' a lower Signal/Noise cut is used.
+    - `cosmicsZeroTesla`: If set to 'True' a 0T-specific selection is used.
     - `momentumConstraint`: If you want to apply a momentum constraint for the
                             track refitting, e.g. for CRUZET data, you need
                             to provide here the name of the constraint module.
@@ -77,9 +79,10 @@ def getSequence(process, collection,
         "rejectLowAngleHits": True,
         "usePixelQualityFlag": usePixelQualityFlag,
         "StoNcommands": cms.vstring("ALL 12.0"),
-        "TrackAngleCut": 0.087
+        "TrackAngleCut": 0.17
         }
     options["TrackFitter"]["HitFilteredTracks"] = {
+        "NavigationSchool": "",
         "TTRHBuilder": TTRHBuilder
         }
 
@@ -100,6 +103,14 @@ def getSequence(process, collection,
             options["TrackHitFilter"]["Tracker"].update({
                     "StoNcommands": cms.vstring("ALL 18.0")
                     })
+        if cosmicsZeroTesla:
+            options["TrackHitFilter"]["Tracker"].update({
+                    "TrackAngleCut": 0.087 # Run-I: 0.087 for 0T
+                    })
+        else:
+            options["TrackHitFilter"]["Tracker"].update({
+                    "TrackAngleCut": 0.087 # Run-I: 0.35 for 3.8T
+                    })
         options["TrackSelector"]["Alignment"].update({
                 "pMin": 4.0,
                 "etaMin": -99.0,

Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorAsAnalyzer.cc

@@ -41,10 +41,13 @@
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/Records/interface/MuonNumberingRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/MuonNumbering/interface/MuonDDDConstants.h"
 #include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDDD.h"
 #include "Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h"
 #include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
+#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
+#include "Geometry/Records/interface/PTrackerParametersRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
 #include "CondFormats/AlignmentRecord/interface/DTAlignmentRcd.h"
@@ -73,7 +76,6 @@ class AlignmentMonitorAsAnalyzer : public edm::EDAnalyzer {
       // ----------member data ---------------------------
       edm::InputTag m_tjTag;
       edm::ParameterSet m_aliParamStoreCfg;
-  const edm::ParameterSet m_pSet;
 
       AlignableTracker *m_alignableTracker;
       AlignableMuon *m_alignableMuon;
@@ -98,8 +100,7 @@ class AlignmentMonitorAsAnalyzer : public edm::EDAnalyzer {
 //
 AlignmentMonitorAsAnalyzer::AlignmentMonitorAsAnalyzer(const edm::ParameterSet& iConfig)
    : m_tjTag(iConfig.getParameter<edm::InputTag>("tjTkAssociationMapTag"))
-     , m_aliParamStoreCfg(iConfig.getParameter<edm::ParameterSet>("ParameterStore")),
-     m_pSet(iConfig)
+   , m_aliParamStoreCfg(iConfig.getParameter<edm::ParameterSet>("ParameterStore"))
    , m_alignableTracker(NULL)
    , m_alignableMuon(NULL)
    , m_alignmentParameterStore(NULL)
@@ -134,7 +135,7 @@ AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSe
 {
    //Retrieve tracker topology from geometry
    edm::ESHandle<TrackerTopology> tTopoHandle;
-   iSetup.get<IdealGeometryRecord>().get(tTopoHandle);
+   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
    const TrackerTopology* const tTopo = tTopoHandle.product();
 
    if (m_firstEvent) {
@@ -145,8 +146,10 @@ AlignmentMonitorAsAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSe
 
       edm::ESHandle<GeometricDet> theGeometricDet;
       iSetup.get<IdealGeometryRecord>().get( theGeometricDet );
+      edm::ESHandle<PTrackerParameters> ptp;
+      iSetup.get<PTrackerParametersRcd>().get( ptp );
       TrackerGeomBuilderFromGeometricDet trackerBuilder;
-      boost::shared_ptr<TrackerGeometry> theTracker(trackerBuilder.build(&(*theGeometricDet), m_pSet ));
+      boost::shared_ptr<TrackerGeometry> theTracker(trackerBuilder.build(&(*theGeometricDet), *ptp ));
 
       edm::ESHandle<MuonDDDConstants> mdc;
       iSetup.get<MuonNumberingRecord>().get(mdc);

Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc

@@ -3,7 +3,7 @@
 #include "DataFormats/Common/interface/View.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Alignment/TrackerAlignment/interface/AlignableTracker.h"
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/Utilities.h"
@@ -311,7 +311,7 @@ void AlignmentStats::endJob(){
 
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
-  lastSetup_->get<IdealGeometryRecord>().get(tTopoHandle);
+  lastSetup_->get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology* const tTopo = tTopoHandle.product();
 
   AlignableTracker* theAliTracker=new AlignableTracker(&(*trackerGeometry_), tTopo);

Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml

@@ -69,6 +69,7 @@
   <use   name="Alignment/MuonAlignment"/>
   <use   name="CondFormats/AlignmentRecord"/>
   <use   name="CondFormats/Alignment"/>
+  <use   name="CondFormats/GeometryObjects"/>
   <flags   EDM_PLUGIN="1"/>
 </library>
 

Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc

@@ -36,9 +36,12 @@
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/Records/interface/MuonNumberingRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDDD.h"
 #include "Geometry/CSCGeometryBuilder/src/CSCGeometryBuilderFromDDD.h"
 #include "Geometry/TrackingGeometryAligner/interface/GeometryAligner.h"
+#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
+#include "Geometry/Records/interface/PTrackerParametersRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h"
@@ -199,7 +202,7 @@ void AlignmentProducer::beginOfJob( const edm::EventSetup& iSetup )
 
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
-  iSetup.get<IdealGeometryRecord>().get(tTopoHandle);
+  iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology* const tTopo = tTopoHandle.product();
 
   // Create the geometries from the ideal geometries (first time only)
@@ -646,8 +649,10 @@ void AlignmentProducer::createGeometries_( const edm::EventSetup& iSetup )
    if (doTracker_) {
      edm::ESHandle<GeometricDet> geometricDet;
      iSetup.get<IdealGeometryRecord>().get( geometricDet );
+     edm::ESHandle<PTrackerParameters> ptp;
+     iSetup.get<PTrackerParametersRcd>().get( ptp );
      TrackerGeomBuilderFromGeometricDet trackerBuilder;
-     theTracker = boost::shared_ptr<TrackerGeometry>( trackerBuilder.build(&(*geometricDet), theParameterSet ));
+     theTracker = boost::shared_ptr<TrackerGeometry>( trackerBuilder.build(&(*geometricDet), *ptp ));
    }
 
    if (doMuon_) {

Alignment/CommonAlignmentProducer/plugins/BuildFile.xml

@@ -15,6 +15,7 @@
   <use   name="CondCore/DBOutputService"/>
   <use   name="CondFormats/Alignment"/>
   <use   name="CondFormats/AlignmentRecord"/>
+  <use   name="CondFormats/GeometryObjects"/>
   <use   name="FWCore/ServiceRegistry"/>
   <use   name="boost"/>
 </library>

Alignment/CommonAlignmentProducer/python/AlignmentProducer_cff.py

@@ -7,7 +7,6 @@
 # algorithms
 from Alignment.HIPAlignmentAlgorithm.HIPAlignmentAlgorithm_cfi import *
 from Alignment.MillePedeAlignmentAlgorithm.MillePedeAlignmentAlgorithm_cfi import *
-from Alignment.KalmanAlignmentAlgorithm.KalmanAlignmentAlgorithm_cfi import *
 # parameters
 from Alignment.CommonAlignmentAlgorithm.AlignmentParameterStore_cfi import *
 

Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc

@@ -21,7 +21,7 @@
 #include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include <cmath>
 
@@ -335,7 +335,7 @@ bool AlignmentTrackSelector::detailedHitsCheck(const reco::Track *trackp, const
 
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
-  eSetup.get<IdealGeometryRecord>().get(tTopoHandle);
+  eSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology* const tTopo = tTopoHandle.product();
 
   // checking hit requirements beyond simple number of valid hits

Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc

@@ -26,7 +26,7 @@
 #include "Alignment/CommonAlignment/interface/AlignableExtras.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
 #include "FWCore/Framework/interface/ValidityInterval.h"
@@ -1137,7 +1137,7 @@ void HIPAlignmentAlgorithm::fillRoot(const edm::EventSetup& iSetup)
 
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
-  iSetup.get<IdealGeometryRecord>().get(tTopoHandle);
+  iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology* const tTopo = tTopoHandle.product();
 
   for (std::vector<Alignable*>::const_iterator it=theAlignables.begin();