prepare to avoid copy of matrix

cbernet · Apr 28, 2014 · cab33e7 · cab33e7
1 parent 3ae8b19
commit cab33e7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/TrackingTools/TrajectoryState/interface/BasicTrajectoryState.h b/TrackingTools/TrajectoryState/interface/BasicTrajectoryState.h
@@ -105,7 +105,18 @@ class BasicTrajectoryState : public BTSCount {
    */
   BasicTrajectoryState( const GlobalTrajectoryParameters& par,
 			      const SurfaceType& aSurface,
-			      const SurfaceSide side = SurfaceSideDefinition::atCenterOfSurface);
+			      const SurfaceSide side = SurfaceSideDefinition::atCenterOfSurface) :
+  theFreeState(par),
+  theLocalError(InvalidError()),
+  theLocalParameters(),
+  theLocalParametersValid(false),
+  theValid(true),
+  theSurfaceSide(side),
+  theSurfaceP( &aSurface),
+  theWeight(1.)
+  {}
+
+
   /** Constructor from global parameters, errors and surface. For surfaces 
    *  with material the side of the surface should be specified explicitely.
    */
@@ -296,7 +307,9 @@ class BasicTrajectoryState : public BTSCount {
                        const LocalTrajectoryError& err,
                        const SurfaceSide side) GCC11_FINAL;
 
-
+ CurvilinearTrajectoryError & setCurvilinearError() {
+    return theFreeState.setCurvilinearError();
+ }
 
 public:
   virtual std::vector<TrajectoryStateOnSurface> components() const;

diff --git a/TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h b/TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h
@@ -133,6 +133,10 @@ class FreeTrajectoryState  {
     createCurvilinearError(CartesianTrajectoryError(err)); 
   }
 
+  CurvilinearTrajectoryError & setCurvilinearError() {
+        return theCurvilinearError;
+  }
+
   void setCurvilinearError(const CurvilinearTrajectoryError &err) {
         theCurvilinearError = err;
   }

diff --git a/TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h b/TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h
@@ -241,6 +241,10 @@ class TrajectoryStateOnSurface : private  BasicTrajectoryState::Proxy {
                const SurfaceSide side) {unsharedData().update(p, err, side);}
 
 
+  CurvilinearTrajectoryError & setCurvilinearError() {
+        return sharedData().setCurvilinearError();
+  }
+
 
 
 };

diff --git a/TrackingTools/TrajectoryState/src/BasicTrajectoryState.cc b/TrackingTools/TrajectoryState/src/BasicTrajectoryState.cc
@@ -76,19 +76,6 @@ BasicTrajectoryState( const FreeTrajectoryState& fts,
   theWeight(1.)
 {}    
 
-BasicTrajectoryState::
-BasicTrajectoryState( const GlobalTrajectoryParameters& par,
-			    const SurfaceType& aSurface,
-			    const SurfaceSide side) :
-  theFreeState(par),
-  theLocalError(InvalidError()),
-  theLocalParameters(),
-  theLocalParametersValid(false),
-  theValid(true),
-  theSurfaceSide(side), 
-  theSurfaceP( &aSurface), 
-  theWeight(1.)
-{}
 
 BasicTrajectoryState::
 BasicTrajectoryState( const GlobalTrajectoryParameters& par,
-Original file line number
+Diff line change
@@ Expand Up @@
                    const SurfaceSide side) {unsharedData().update(p, err, side);}
+      CurvilinearTrajectoryError & setCurvilinearError() {
+            return sharedData().setCurvilinearError();
+      }
     };
@@ Expand Down @@