proper ClosestApproach reinstantation in examples

Author: edcallaghan

Examples/ScintHit.hh

@@ -17,18 +17,28 @@ namespace KinKal {
       using RESIDHIT = ResidualHit<KTRAJ>;
       using HIT = Hit<KTRAJ>;
       using KTRAJPTR = std::shared_ptr<KTRAJ>;
-      // clone op for reinstantiation
+      // copy constructor
       ScintHit(ScintHit<KTRAJ> const& rhs):
           ResidualHit<KTRAJ>(rhs),
           saxis_(rhs.sensorAxis()),
           tvar_(rhs.timeVariance()),
           wvar_(rhs.widthVariance()),
-          tpca_(rhs.closestApproach()),
+          tpca_(
+                rhs.closestApproach().particleTraj(),
+                saxis_,
+                rhs.closestApproach().hint(),
+                rhs.closestApproach().precision()
+          ),
           rresid_(rhs.refResidual()){
         /**/
       };
+      // clone op for reinstantiation
       std::shared_ptr< Hit<KTRAJ> > clone(CloneContext& context) const override{
         auto rv = std::make_shared< ScintHit<KTRAJ> >(*this);
+        auto ca = rv->closestApproach();
+        auto trajectory = std::make_shared<KTRAJ>(ca.particleTraj());
+        ca.setTrajectory(trajectory);
+        rv->setClosestApproach(ca);
         return rv;
       };
       // ResidualHit interface implementation
@@ -54,6 +64,9 @@ namespace KinKal {
       double wvar_; // variance in transverse position of the sensor/measurement in mm.  Assumes cylindrical error, could be more general
       CA tpca_; // reference time and position of closest approach to the axis
       Residual rresid_; // residual WRT most recent reference parameters
+
+      // modifiers to support cloning
+      void setClosestApproach(const CA& ca){ tpca_ = ca; }
   };
 
   template <class KTRAJ> ScintHit<KTRAJ>::ScintHit(PCA const& pca, double tvar, double wvar) :

Examples/SimpleWireHit.hh

@@ -81,8 +81,7 @@ namespace KinKal {
       auto const& residuals() const { return rresid_; }
       double tot() const { return tot_; }
       double totVariance() const { return totvar_; }
-      // other accessors
-      void setClosestApproach(const CA& ca){ ca_ = ca; }
+
     private:
       BFieldMap const& bfield_; // drift calculation requires the BField for ExB effects
       WireHitState whstate_; // current state
@@ -100,6 +99,9 @@ namespace KinKal {
       double rcell_; // straw radius
       int id_; // id
       void updateResiduals();
+
+      // modifiers to support cloning
+      void setClosestApproach(const CA& ca){ ca_ = ca; }
   };
 
   //trivial 'updater' that sets the wire hit state to null

Examples/StrawXing.hh

@@ -22,7 +22,23 @@ namespace KinKal {
       StrawXing(PCA const& pca, StrawMaterial const& smat);
       virtual ~StrawXing() {}
       // copy constructor
-      StrawXing(StrawXing const& rhs) = default;
+      StrawXing(StrawXing const& rhs):
+          ElementXing<KTRAJ>(rhs),
+          axis_(rhs.axis_),
+          smat_(rhs.smat_),
+          tpca_(
+                rhs.closestApproach().particleTraj(),
+                axis_,
+                rhs.closestApproach().hint(),
+                rhs.closestApproach().precision()
+          ),
+          toff_(rhs.toff_),
+          sxconfig_(rhs.sxconfig_),
+          varscale_(rhs.varscale_),
+          mxings_(rhs.mxings_),
+          fparams_(rhs.fparams_){
+        /**/
+      }
       // clone op for reinstantiation
       std::shared_ptr< ElementXing<KTRAJ> > clone(CloneContext& context) const override{
         auto rv = std::make_shared< StrawXing<KTRAJ> >(*this);
@@ -46,8 +62,7 @@ namespace KinKal {
       auto const& strawMaterial() const { return smat_; }
       auto const& config() const { return sxconfig_; }
       auto precision() const { return tpca_.precision(); }
-      // other accessors
-      void setClosestApproach(const CA& ca){ tpca_ = ca; }
+
     private:
       SensorLine axis_; // straw axis, expressed as a timeline
       StrawMaterial const& smat_;
@@ -57,6 +72,9 @@ namespace KinKal {
       double varscale_; // variance scale
       std::vector<MaterialXing> mxings_;
       Parameters fparams_; // parameter change for forwards time
+
+      // modifiers to support cloning
+      void setClosestApproach(const CA& ca){ tpca_ = ca; }
   };
 
   template <class KTRAJ> StrawXing<KTRAJ>::StrawXing(PCA const& pca, StrawMaterial const& smat) :