Merge pull request #16 from cms-sw/CMSSW_7_1_X

update my CMSSW_7_1_X with the official one

Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h

@@ -31,7 +31,7 @@ class AlignableMuon;
 class AlignableExtras;
 
 class TrajectoryStateOnSurface;
-class TransientTrackingRecHit;
+class TrackingRecHit;
 
 namespace edm { class EventSetup; class ParameterSet; } 
 
@@ -55,7 +55,7 @@ class IntegratedCalibrationBase
   /// Return all derivatives for x- (Values.first) and y-measurement (Values.second),
   /// default implementation uses other derivatives(..) method,
   /// but can be overwritten in derived class for efficiency.
-  virtual std::vector<Values> derivatives(const TransientTrackingRecHit &hit,
+  virtual std::vector<Values> derivatives(const TrackingRecHit &hit,
 					  const TrajectoryStateOnSurface &tsos,
 					  const edm::EventSetup &setup,
 					  const EventInfo &eventInfo) const;
@@ -65,7 +65,7 @@ class IntegratedCalibrationBase
   /// indices (ValuesIndexPair.second) by reference.
   /// Return value is their number.
   virtual unsigned int derivatives(std::vector<ValuesIndexPair> &outDerivInds,
-				   const TransientTrackingRecHit &hit,
+				   const TrackingRecHit &hit,
 				   const TrajectoryStateOnSurface &tsos,
 				   const edm::EventSetup &setup,
 				   const EventInfo &eventInfo) const = 0;

Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationBase.cc

@@ -23,7 +23,7 @@ IntegratedCalibrationBase::IntegratedCalibrationBase(const edm::ParameterSet &cf
 
 //============================================================================
 std::vector<IntegratedCalibrationBase::Values>
-IntegratedCalibrationBase::derivatives(const TransientTrackingRecHit &hit,
+IntegratedCalibrationBase::derivatives(const TrackingRecHit &hit,
 				       const TrajectoryStateOnSurface &tsos,
 				       const edm::EventSetup &setup,
 				       const EventInfo &eventInfo) const

Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc

@@ -141,7 +141,7 @@ AlignmentMuonHIPTrajectorySelector::produce(edm::Event& iEvent, const edm::Event
 	 double tracker_dof = 0.;
 	 for (std::vector<TrajectoryMeasurement>::const_iterator im = measurements.begin();  im != measurements.end();  ++im) {
 	    const TrajectoryMeasurement meas = *im;
-	    const TransientTrackingRecHit* hit = &(*meas.recHit());
+	    auto hit = &(*meas.recHit());
 	    const DetId id = hit->geographicalId();
 
 	    if (hit->isValid()  &&  id.det() == DetId::Tracker) {
@@ -183,7 +183,7 @@ AlignmentMuonHIPTrajectorySelector::produce(edm::Event& iEvent, const edm::Event
 
 	    for (std::vector<TrajectoryMeasurement>::const_iterator im = measurements.begin();  im != measurements.end();  ++im) {
 	       const TrajectoryMeasurement meas = *im;
-	       const TransientTrackingRecHit* hit = &(*meas.recHit());
+	       auto hit = &(*meas.recHit());
 	       const DetId id = hit->geographicalId();
 
 	       if (!has_bad_residual) {

Alignment/HIPAlignmentAlgorithm/interface/HIPAlignmentAlgorithm.h

@@ -13,9 +13,6 @@
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h" 	 
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h" 	 
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h" 	 
-#include "RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit1D.h" 	 
-#include "RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit2DLocalPos.h" 	 
-#include "RecoTracker/TransientTrackingRecHit/interface/TSiPixelRecHit.h"
 
 class AlignableNavigator;
 class TFile;
@@ -53,12 +50,12 @@ class HIPAlignmentAlgorithm : public AlignmentAlgorithmBase
   bool processHit1D(const AlignableDetOrUnitPtr& alidet,
 		    const Alignable* ali,
 		    const TrajectoryStateOnSurface & tsos,
-		    const TransientTrackingRecHit* hit);
+		    const TrackingRecHit* hit);
 
   bool processHit2D(const AlignableDetOrUnitPtr& alidet,
 		    const Alignable* ali,
 		    const TrajectoryStateOnSurface & tsos,
-		    const TransientTrackingRecHit* hit);
+		    const TrackingRecHit* hit);
 
   int readIterationFile(std::string filename);
   void writeIterationFile(std::string filename, int iter);

Alignment/KalmanAlignmentAlgorithm/interface/CurrentAlignmentKFUpdator.h

@@ -35,8 +35,8 @@ class CurrentAlignmentKFUpdator : public TrajectoryStateUpdator
 					typename AlgebraicROOTObject<D>::Vector & vecR,
 					typename AlgebraicROOTObject<D>::SymMatrix & matV ) const;
 
-  AlignmentParameters* getAlignmentParameters( const AlignableDetOrUnitPtr& alignableDet ) const;
-  AlignmentParameters* getHigherLevelParameters( const Alignable* aAlignable ) const;
+  AlignmentParameters const* getAlignmentParameters( const AlignableDetOrUnitPtr& alignableDet ) const;
+  AlignmentParameters const* getHigherLevelParameters( const Alignable* aAlignable ) const;
 
   AlignableNavigator* theAlignableNavigator;
 

Alignment/KalmanAlignmentAlgorithm/src/CurrentAlignmentKFUpdator.cc

@@ -92,7 +92,7 @@ void CurrentAlignmentKFUpdator::includeCurrentAlignmentEstimate( const TrackingR
     return;
   }
 
-  AlignmentParameters* alignmentParameters = getAlignmentParameters( alignableDet );
+  AlignmentParameters const* alignmentParameters = getAlignmentParameters( alignableDet );
 
   if ( alignmentParameters )
   {
@@ -119,17 +119,17 @@ void CurrentAlignmentKFUpdator::includeCurrentAlignmentEstimate( const TrackingR
 }
 
 
-AlignmentParameters* CurrentAlignmentKFUpdator::getAlignmentParameters( const AlignableDetOrUnitPtr& alignableDet ) const
+AlignmentParameters const* CurrentAlignmentKFUpdator::getAlignmentParameters( const AlignableDetOrUnitPtr& alignableDet ) const
 {
   // Get alignment parameters from AlignableDet ...
-  AlignmentParameters* alignmentParameters = alignableDet->alignmentParameters();
+  AlignmentParameters const* alignmentParameters = alignableDet->alignmentParameters();
   // ... or any higher level alignable.
   if ( !alignmentParameters ) alignmentParameters = getHigherLevelParameters( alignableDet );
   return alignmentParameters;
 }
 
 
-AlignmentParameters* CurrentAlignmentKFUpdator::getHigherLevelParameters( const Alignable* aAlignable ) const
+AlignmentParameters const* CurrentAlignmentKFUpdator::getHigherLevelParameters( const Alignable* aAlignable ) const
 {
   Alignable* higherLevelAlignable = aAlignable->mother();
   // Alignable has no mother ... most probably the alignable is already the full tracker.

Alignment/MuonAlignmentAlgorithms/plugins/MuonMillepedeTrackRefitter.cc

@@ -112,7 +112,7 @@ void MuonMillepedeTrackRefitter::produce( edm::Event & event, const edm::EventSe
 
       TrackingRecHit *myClone = (*theHit)->clone(); 
       const GeomDet* myDet = theTrackingGeometry->idToDet( (*theHit)->geographicalId() );
-      TrajectoryMeasurement myMeas(innerTSOS, &* MuonTransientTrackingRecHit::specificBuild(myDet, (TrackingRecHit *) &*myClone));
+      TrajectoryMeasurement myMeas(innerTSOS, MuonTransientTrackingRecHit::specificBuild(myDet, (TrackingRecHit *) &*myClone));
       myTraj.push(myMeas);
 
     }

Alignment/OfflineValidation/src/TrackerValidationVariables.cc

@@ -92,10 +92,10 @@ TrackerValidationVariables::fillHitQuantities(const Trajectory* trajectory, std:
     hitStruct.localAlpha = atan2(lVTrk.x(), lVTrk.z()); // wrt. normal tg(alpha)=x/z
     hitStruct.localBeta  = atan2(lVTrk.y(), lVTrk.z()); // wrt. normal tg(beta)= y/z
 
-    //LocalError errHit = hit->localPositionError();
-    // adding APE to hitError
-    AlgebraicROOTObject<2>::SymMatrix mat = asSMatrix<2>(hit->parametersError());
-    LocalError errHit = LocalError( mat(0,0),mat(0,1),mat(1,1) );
+    LocalError errHit = hit->localPositionError();
+    // no need to add  APE to hitError anymore
+    // AlgebraicROOTObject<2>::SymMatrix mat = asSMatrix<2>(hit->parametersError());
+    // LocalError errHit = LocalError( mat(0,0),mat(0,1),mat(1,1) );
     LocalError errTrk = tsos.localError().positionError();
 
     //check for negative error values: track error can have negative value, if matrix inversion fails (very rare case)

Alignment/ReferenceTrajectories/interface/BeamSpotTransientTrackingRecHit.h

@@ -32,7 +32,7 @@ class BeamSpotTransientTrackingRecHit GCC11_FINAL : public TValidTrackingRecHit
   BeamSpotTransientTrackingRecHit(const reco::BeamSpot &beamSpot,
 				  const BeamSpotGeomDet * geom,
 				  double phi)
-    : TValidTrackingRecHit(geom, AlignableBeamSpot::detId(), valid) {
+    : TValidTrackingRecHit(*geom) {
 
     localPosition_ = det()->toLocal(GlobalPoint(beamSpot.x0(), beamSpot.y0(), beamSpot.z0()));
     localError_ = LocalError(std::pow(beamSpot.BeamWidthX()*cos(phi), 2) +

Alignment/ReferenceTrajectories/plugins/TwoBodyDecayTrajectoryFactory.cc

@@ -222,11 +222,17 @@ TwoBodyDecayTrajectoryFactory::constructTrajectories( const ConstTrajTrackPairCo
   }
 
   // always use the refitted trajectory state for matching
-  TransientTrackingRecHit::ConstRecHitPointer updatedRecHit1( recHits.first.front()->clone( tsos.first ) );
+  // FIXME FIXME CLONE
+  //TrackingRecHit::ConstRecHitPointer updatedRecHit1( recHits.first.front()->clone( tsos.first ) );
+  // TrackingRecHit::ConstRecHitPointer updatedRecHit2( recHits.second.front()->clone( tsos.second ) );
+
+  TrackingRecHit::ConstRecHitPointer updatedRecHit1( recHits.first.front() );
+  TrackingRecHit::ConstRecHitPointer updatedRecHit2( recHits.second.front() );
+
+
   bool valid1 = match( trajectoryState.trajectoryStates( true ).first,
 		       updatedRecHit1 );
 
-  TransientTrackingRecHit::ConstRecHitPointer updatedRecHit2( recHits.second.front()->clone( tsos.second ) );
   bool valid2 = match( trajectoryState.trajectoryStates( true ).second,
 		       updatedRecHit2 );
 

Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc

@@ -176,10 +176,9 @@ bool ReferenceTrajectory::construct(const TrajectoryStateOnSurface &refTsos,
     // There is also a constructor taking the magentic field. Use this one instead?
     theRefTsos = TrajectoryStateOnSurface(pcaFts, bsGeom->surface());
 
-    TransientTrackingRecHit::ConstRecHitPointer bsRecHit = 
-      new BeamSpotTransientTrackingRecHit(beamSpot,
+    TransientTrackingRecHit::ConstRecHitPointer bsRecHit(new BeamSpotTransientTrackingRecHit(beamSpot,
 					  bsGeom,
-					  theRefTsos.freeState()->momentum().phi());
+					  theRefTsos.freeState()->momentum().phi()));
     allRecHits.push_back(bsRecHit);
 
   }
@@ -411,8 +410,11 @@ void ReferenceTrajectory::fillMeasurementAndError(const TransientTrackingRecHit:
   //             That is an analytical extrapolation and not the best guess of the real 
   //             track state on the module, but the latter should be better to get the best
   //             hit uncertainty estimate!
-  TransientTrackingRecHit::ConstRecHitPointer newHitPtr(hitPtr->canImproveWithTrack() ?
-							hitPtr->clone(updatedTsos) : hitPtr);
+
+   // FIXME FIXME  CLONE
+  auto newHitPtr =  hitPtr;
+//  TransientTrackingRecHit::ConstRecHitPointer newHitPtr(hitPtr->canImproveWithTrack() ?
+//							hitPtr->clone(updatedTsos) : hitPtr);
 
   const LocalPoint localMeasurement    = newHitPtr->localPosition();
   const LocalError localMeasurementCov = newHitPtr->localPositionError();

Alignment/ReferenceTrajectories/src/TrajectoryFactoryBase.cc

@@ -111,8 +111,7 @@ TrajectoryFactoryBase::useRecHit( const TransientTrackingRecHit::ConstRecHitPoin
 
   if ( !theUseProjectedHits )
   {
-    const ProjectedRecHit2D* projectedHit = dynamic_cast< const ProjectedRecHit2D* >( hitPtr.get() );
-    if ( projectedHit != 0 ) return false;
+    if(trackerHitRTTI::isProjected(*hitPtr)) return false;
   }
 
   return true;

Alignment/TrackerAlignment/plugins/AlignmentPrescaler.cc

@@ -13,6 +13,7 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "AnalysisDataFormats/TrackInfo/interface/TrackInfo.h"
 
+#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
 #include "RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit2DLocalPos.h"

Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc

@@ -20,8 +20,6 @@
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
-#include "RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit1D.h"
-#include "RecoTracker/TransientTrackingRecHit/interface/TSiStripRecHit2DLocalPos.h"
 #include "RecoTracker/TransientTrackingRecHit/interface/TSiPixelRecHit.h"
 #include "Utilities/General/interface/ClassName.h"
 
@@ -112,7 +110,7 @@ void TkAlCaOverlapTagger::produce(edm::Event &iEvent, const edm::EventSetup &iSe
       }
 
 
-      TransientTrackingRecHit::ConstRecHitPointer hitpointer = itTrajMeas->recHit();
+      TrackingRecHit::ConstRecHitPointer hitpointer = itTrajMeas->recHit();
       const TrackingRecHit *hit=&(* hitpointer);
       if(!hit->isValid())continue;
 
@@ -139,13 +137,13 @@ void TkAlCaOverlapTagger::produce(edm::Event &iEvent, const edm::EventSetup &iSe
 	    if (hitInStrip){
 	      //cout<<"  TypeId of the RecHit: "<<className(*hit)<<endl;
 	      // const std::type_info &type = typeid(*hit);
-	      const TSiStripRecHit2DLocalPos* transstriphit2D = dynamic_cast<const  TSiStripRecHit2DLocalPos*>(hit);
-	      const TSiStripRecHit1D* transstriphit1D = dynamic_cast<const  TSiStripRecHit1D*>(hit);
+	      const SiStripRecHit2D* transstriphit2D = dynamic_cast<const  SiStripRecHit2D*>(hit);
+	      const SiStripRecHit1D* transstriphit1D = dynamic_cast<const  SiStripRecHit1D*>(hit);
 
 	      //   if (type == typeid(SiStripRecHit1D)) {
 	      if(transstriphit1D!=0){
 		//	const SiStripRecHit1D* striphit=dynamic_cast<const  SiStripRecHit1D*>(hit);
-		const SiStripRecHit1D* striphit=transstriphit1D->specificHit();
+		const SiStripRecHit1D* striphit=transstriphit1D;
 		if(striphit!=0){
 		  SiStripRecHit1D::ClusterRef stripclust(striphit->cluster());
 
@@ -163,7 +161,7 @@ void TkAlCaOverlapTagger::produce(edm::Event &iEvent, const edm::EventSetup &iSe
 	      else if(transstriphit2D!=0){
 	      //else if (type == typeid(SiStripRecHit2D)) {
 		//		const SiStripRecHit2D* striphit=dynamic_cast<const  SiStripRecHit2D*>(hit);
-		const SiStripRecHit2D* striphit=transstriphit2D->specificHit();   
+		const SiStripRecHit2D* striphit=transstriphit2D;   
 		if(striphit!=0){
 		  SiStripRecHit2D::ClusterRef stripclust(striphit->cluster());
 
@@ -188,9 +186,9 @@ void TkAlCaOverlapTagger::produce(edm::Event &iEvent, const edm::EventSetup &iSe
 
 	    }//end if hit in Strips
 	    else {//pixel hit
-	      const TSiPixelRecHit* transpixelhit = dynamic_cast<const TSiPixelRecHit*>(hit);
+	      const SiPixelRecHit* transpixelhit = dynamic_cast<const SiPixelRecHit*>(hit);
 	      if(transpixelhit!=0){
-		const SiPixelRecHit* pixelhit=transpixelhit->specificHit();
+		const SiPixelRecHit* pixelhit=transpixelhit;
 		SiPixelClusterRefNew pixclust(pixelhit->cluster());
 
 		if(pixclust.id()==pixelclusters.id()){

AnalysisAlgos/TrackInfoProducer/interface/TrackInfoProducerAlgorithm.h

@@ -20,7 +20,7 @@
 class TrackInfoProducerAlgorithm {
 
  public:
-typedef TransientTrackingRecHit::ConstRecHitPointer ConstRecHitPointer;
+typedef TrackingRecHit::ConstRecHitPointer ConstRecHitPointer;
 
   TrackInfoProducerAlgorithm(const edm::ParameterSet& conf) : 
     conf_(conf),

CalibTracker/Records/interface/SiPixelGenErrorDBObjectESProducerRcd.h

@@ -0,0 +1,13 @@
+#ifndef CalibTracker_Records_SiPixelGenErrorDBObjectESProducerRcd_h
+#define CalibTracker_Records_SiPixelGenErrorDBObjectESProducerRcd_h
+
+#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
+#include "FWCore/Framework/interface/DependentRecordImplementation.h"
+#include "boost/mpl/vector.hpp"
+
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "CondFormats/DataRecord/interface/SiPixelGenErrorDBObjectRcd.h"
+
+class SiPixelGenErrorDBObjectESProducerRcd : public edm::eventsetup::DependentRecordImplementation<SiPixelGenErrorDBObjectESProducerRcd, boost::mpl::vector<IdealMagneticFieldRecord, SiPixelGenErrorDBObjectRcd> > {};
+
+#endif

CalibTracker/Records/src/SiPixelGenErrorDBObjectESProducerRcd.cc

@@ -0,0 +1,4 @@
+#include "CalibTracker/Records/interface/SiPixelGenErrorDBObjectESProducerRcd.h"
+#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+
+EVENTSETUP_RECORD_REG(SiPixelGenErrorDBObjectESProducerRcd);

CalibTracker/SiPixelESProducers/interface/SiPixelFakeGenErrorDBObjectESSource.h

@@ -0,0 +1,35 @@
+#ifndef CalibTracker_SiPixelESProducers_SiPixelFakeGenErrorDBObjectESSource_h
+#define CalibTracker_SiPixelESProducers_SiPixelFakeGenErrorDBObjectESSource_h
+
+#include <memory>
+#include "boost/shared_ptr.hpp"
+
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelGenErrorDBObject.h"
+#include "CondFormats/DataRecord/interface/SiPixelGenErrorDBObjectRcd.h"
+
+class SiPixelFakeGenErrorDBObjectESSource : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
+
+ public:
+  SiPixelFakeGenErrorDBObjectESSource(const edm::ParameterSet &);
+  ~SiPixelFakeGenErrorDBObjectESSource();
+
+  typedef std::vector<std::string> vstring;
+
+  virtual std::auto_ptr<SiPixelGenErrorDBObject>  produce(const SiPixelGenErrorDBObjectRcd &);
+
+ protected:
+
+  virtual void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&,
+			       const edm::IOVSyncValue&,
+			       edm::ValidityInterval& );
+
+ private:
+
+ 	vstring GenErrorCalibrations_;
+	float version_;
+
+};
+#endif

CalibTracker/SiPixelESProducers/interface/SiPixelGenErrorDBObjectESProducer.h

@@ -0,0 +1,33 @@
+#ifndef CalibTracker_SiPixelESProducers_SiPixelGenErrorDBObjectESProducer_h
+#define CalibTracker_SiPixelESProducers_SiPixelGenErrorDBObjectESProducer_h
+// -*- C++ -*-
+//
+// Package:    SiPixelGenErrorDBObjectESProducer
+// Class:      SiPixelGenErrorDBObjectESProducer
+// 
+/**\class SiPixelGenErrorDBObjectESProducer SiPixelGenErrorDBObjectESProducer.cc CalibTracker/SiPixelESProducers/plugin/SiPixelGenErrorDBObjectESProducer.cc
+
+ Description: ESProducer for magnetic-field-dependent local reco GenErrors
+
+ Implementation: Used inside the RecoLocalTracker/Records/TkPixelRecord to select the correct db for given magnetic field
+*/
+//
+// Original Author:  D.Fehling
+//         Created:  Tue Sep 29 14:49:31 CET 2009
+//
+//
+
+#include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelGenErrorDBObject.h"
+#include "CalibTracker/Records/interface/SiPixelGenErrorDBObjectESProducerRcd.h"
+
+class SiPixelGenErrorDBObjectESProducer : public edm::ESProducer  {
+
+public:
+
+	SiPixelGenErrorDBObjectESProducer(const edm::ParameterSet& iConfig);
+  ~SiPixelGenErrorDBObjectESProducer();
+	boost::shared_ptr<SiPixelGenErrorDBObject> produce(const SiPixelGenErrorDBObjectESProducerRcd &);
+ };
+#endif