---

yaml
---
r: 153479
b: "refs/heads/CMSSW_8_1_X"
c: d6b139e
h: "refs/heads/CMSSW_8_1_X"
i:
  153477: 75ec527
  153475: 8751c73
  153471: 00a1c94

[refs]

@@ -1,2 +1,2 @@
 ---
-"refs/heads/CMSSW_8_1_X": fe96bd70c36163f153767c11c0d73c926585e4ff
+"refs/heads/CMSSW_8_1_X": d6b139eff62f2c801d4ee0219d6ed83f8f6f4164

trunk/Alignment/CommonAlignment/interface/Alignable.h

@@ -243,6 +243,4 @@ class Alignable
 
 };
 
-typedef std::vector<Alignable*> Alignables;
-
 #endif

trunk/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h

@@ -2,21 +2,11 @@
 #ifndef Alignment_CommonAlignmentAlgorithm_AlignmentAlgorithmBase_h
 #define Alignment_CommonAlignmentAlgorithm_AlignmentAlgorithmBase_h
 
-/**
- * @package   Alignment/CommonAlignmentAlgorithm
- * @file      AlignmentAlgorithmBase.h
- *
- * @author    ???
- *
- * Last update:
- * @author    Max Stark (max.stark@cern.ch)
- * @date      2015/07/16
- *
- * @brief     Interface/Base class for alignment algorithms, each alignment
- *            algorithm has to be derived from this class
- */
-
-
+///
+/// Base class for the alignment algorithm
+///
+/// Any algorithm should derive from this class
+///
 
 #include <vector>
 #include <utility>
@@ -42,27 +32,11 @@ class Trajectory;
 namespace edm { class EventSetup; class ParameterSet; }
 namespace reco { class Track; class BeamSpot; }
 
-/*** Global typedefs part I (see EOF for part II) ***/
-typedef std::pair<const Trajectory*, const reco::Track*> ConstTrajTrackPair;
-typedef std::vector< ConstTrajTrackPair >                ConstTrajTrackPairs;
-
-typedef std::vector<IntegratedCalibrationBase*> Calibrations;
-
-typedef cond::RealTimeType<cond::runnumber>::type RunNumber;
-typedef std::pair<RunNumber,RunNumber>            RunRange;
-typedef std::vector<RunRange>                     RunRanges;
-
-
-
 class AlignmentAlgorithmBase
 {
 
 public:
-  // TODO: DEPRECATED: For not breaking the interface, used in serveral files.
-  //                   If possible use the global typedefs above.
-  // With global typedefs one does not have to typedef again like
-  // 'typedef AlignmentAlgorithmBase::ConstTrajTrackPair ConstTrajTrackPair;'
-  // in other files.
+
   typedef std::pair<const Trajectory*, const reco::Track*> ConstTrajTrackPair; 
   typedef std::vector< ConstTrajTrackPair >  ConstTrajTrackPairCollection;
   typedef cond::RealTimeType<cond::runnumber>::type RunNumber;
@@ -109,7 +83,7 @@ class AlignmentAlgorithmBase
   };
 
   /// Constructor
-  AlignmentAlgorithmBase(const edm::ParameterSet&) {};
+  AlignmentAlgorithmBase(const edm::ParameterSet& cfg);
 
   /// Destructor
   virtual ~AlignmentAlgorithmBase() {};
@@ -120,27 +94,18 @@ class AlignmentAlgorithmBase
                            AlignableMuon* muon,
                            AlignableExtras* extras,
                            AlignmentParameterStore* store ) = 0;
-
-  /// Returns whether calibrations is supported by algorithm,
+  /// Pass integrated calibrations to algorithm, to be called after initialize(..).
+  /// (Calibrations' ownership is NOT passed to algorithm.)
+  /// Return whether feature is supported by algorithm, 
   /// default implementation returns false.
-  virtual bool supportsCalibrations() { return false; }
-  /// Pass integrated calibrations to algorithm, to be called after initialize()
-  /// Calibrations' ownership is NOT passed to algorithm
-  virtual bool addCalibrations(const Calibrations&) { return false; }
-
-  /// Returns whether algorithm proccesses events in current configuration
-  virtual bool processesEvents() { return true; }
-
-  // TODO: DEPRECATED: Actually, there are no iterative algorithms, use
-  //                   initialze() and terminate()
-  /// Called at start of loop, default implementation is dummy for
-  /// non-iterative algorithms
+  virtual bool addCalibrations(const std::vector<IntegratedCalibrationBase*> &iCals){return false;}
+
+   /// Call at start of loop
+   /// Default implementation is dummy for non-iterative algorithms
   virtual void startNewLoop() {}
 
   /// Call at end of each loop (must be implemented in derived class)
   virtual void terminate(const edm::EventSetup& iSetup) = 0;
-  /// Called at end of job (must be implemented in derived class)
-  virtual void terminate() {}
 
   /// Run the algorithm (must be implemented in derived class)
   virtual void run( const edm::EventSetup &setup, const EventInfo &eventInfo) = 0;
@@ -162,8 +127,4 @@ class AlignmentAlgorithmBase
   virtual bool setParametersForRunRange(const RunRange& rr) { return false; };
 };
 
-/*** Global typedefs part II ***/
-typedef AlignmentAlgorithmBase::EventInfo  EventInfo;
-typedef AlignmentAlgorithmBase::EndRunInfo EndRunInfo;
-
 #endif

trunk/Alignment/CommonAlignmentAlgorithm/src/AlignmentAlgorithmBase.cc

@@ -0,0 +1,9 @@
+#include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h"
+
+
+//__________________________________________________________________________________________________
+AlignmentAlgorithmBase::AlignmentAlgorithmBase( const edm::ParameterSet& cfg )
+{
+
+}
+

trunk/Alignment/CommonAlignmentMonitor/interface/AlignmentMonitorBase.h

@@ -110,7 +110,5 @@ class AlignmentMonitorBase
       std::map<std::vector<std::string>, TFileDirectory*> m_baseDirMap, m_iterDirMap;
 };
 
-/*** Global typedefs ***/
-typedef std::vector<AlignmentMonitorBase*> AlignmentMonitors;
 
 #endif

trunk/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml

@@ -19,20 +19,6 @@
   <use   name="FWCore/ServiceRegistry"/>
   <use   name="boost"/>
 </library>
-<library   name="AlignmentPCLTrackerAlignmentProducerPlugin" file="PCLTrackerAlProducer.cc">
-  <use   name="Alignment/CommonAlignment"/>
-  <use   name="Alignment/CommonAlignmentAlgorithm"/>
-  <use   name="Alignment/CommonAlignmentMonitor"/>
-  <use   name="Alignment/CommonAlignmentParametrization"/>
-  <use   name="Alignment/MuonAlignment"/>
-  <use   name="Alignment/TrackerAlignment"/>
-  <use   name="CondCore/DBOutputService"/>
-  <use   name="CondFormats/Alignment"/>
-  <use   name="CondFormats/AlignmentRecord"/>
-  <use   name="CondFormats/GeometryObjects"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="boost"/>
-</library>
 <library   name="CommonAlignmentProducerSelectors" file="Alignment*SelectorModule.cc,AlignmentMuonHIPTrajectorySelector.cc">
   <use   name="Alignment/CommonAlignmentProducer"/>
   <use   name="DataFormats/DetId"/>
@@ -73,6 +59,3 @@
   <use   name="DataFormats/DTRecHit"/>
   <use   name="DataFormats/RPCRecHit"/>
 </library>
-<library   file="LSNumberFilter.cc" name="AlignmentCommonAlignmentProducerFilter">
-  <flags   EDM_PLUGIN="1"/>
-</library>

trunk/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc

@@ -1029,7 +1029,7 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
     AlgebraicSymMatrix55 Cml(tsosMuon.localError().matrix() + extrapolationT.localError().matrix());
     bool ierrLoc = !m.Invert();
     if (ierrLoc && debug_ && info) { 
-      std::cout<< " ==== Error inverting Local covariance matrix ==== "<<std::endl;
+      std::cout<< " ==== Error inverting Local covariance matrix ==== "<<std::cout;
       continue;}
     double chi_Loc = ROOT::Math::Similarity(Vml,m);
     if(debug_)
@@ -1802,7 +1802,7 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
     AlgebraicSymMatrix55 Cml(tsosMuon.localError().matrix() + extrapolationT.localError().matrix());
     bool ierrLoc = !m.Invert();
     if (ierrLoc && debug_ && info) { 
-      std::cout<< " ==== Error inverting Local covariance matrix ==== "<<std::endl;
+      std::cout<< " ==== Error inverting Local covariance matrix ==== "<<std::cout;
       continue;}
     double chi_Loc = ROOT::Math::Similarity(Vml,m);
     if(debug_)