---

yaml --- r: 257091 b: refs/heads/vhbbHeppy80X c: 2e58f44 h: refs/heads/vhbbHeppy80X i: 257089: 0149a26 257087: bfec8da
cms-sw · Oct 22, 2010 · 4000815 · 4000815
1 parent f279035
commit 4000815
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -940,4 +940,4 @@ refs/tags/VHbbPartialRecipe2: 256bfb5e9665f673d2676e731f625979a9285825
 "refs/tags/merge_44x_and_52x": ed680f9c28b049994015aba236682fb3a432ee54
 "refs/tags/michalis_beamspot_44x": 623c4bfbc791650c2cb072d7aacf65a129e503aa
 "refs/tags/wreece_111110": 410d7045522d8d37ceb9a4bd9795dcd5ccc4eed1
-refs/heads/vhbbHeppy80X: 2eb51185307394d484f3e4355190e3c4fac2af24
+refs/heads/vhbbHeppy80X: 2e58f448aad7f084933a3a5c22bbe7239f32eadb
diff --git a/trunk/RecoVertex/KinematicFit/interface/CombinedKinematicConstraintT.h b/trunk/RecoVertex/KinematicFit/interface/CombinedKinematicConstraintT.h
@@ -133,7 +133,7 @@ template< class TupleType, int NTRK >
 class CombinedKinematicConstraintT : public MultiTrackKinematicConstraintT<NTRK, combinedConstraintHelpers::totDim<TupleType>::nDim>{
 
   // need compile time assert on NTRK
-
+public:
   typedef MultiTrackKinematicConstraintBaseT base;
   typedef MultiTrackKinematicConstraintT<NTRK,combinedConstraintHelpers::totDim<TupleType>::nDim> super;
   typedef typename super::valueType valueType;

diff --git a/trunk/RecoVertex/KinematicFit/test/test_CombinedConstraint.cpp b/trunk/RecoVertex/KinematicFit/test/test_CombinedConstraint.cpp
@@ -21,6 +21,12 @@ int main() {
             << " " << ckc.numberOfEquations() 
             << std::endl;
 
+  CKC::valueType v = ckc.value();
+  CKC::parametersDerivativeType pad =  ckc.parametersDerivative();
+  CKC::positionDerivativeType pod = ckc.positionDerivative();
+
+  std::cout << v(0) << " " << pad(0,0) << " " << pod(0,0) << std::endl;
+
   KinematicConstrainedVertexFitterT<CKC::nTrk,CKC::nDim> kinefit(0);
 
 #else

diff --git a/trunk/RecoVertex/KinematicFitPrimitives/interface/MultiTrackKinematicConstraintT.h b/trunk/RecoVertex/KinematicFitPrimitives/interface/MultiTrackKinematicConstraintT.h
@@ -43,6 +43,13 @@ class MultiTrackKinematicConstraintT : public MultiTrackKinematicConstraintBaseT
 public:
   enum {nTrk=NTRK, nDim=DIM};
 
+  typedef ROOT::Math::SVector<double, DIM>  valueType; 
+
+  typedef ROOT::Math::SMatrix<double, DIM,7*NTRK> parametersDerivativeType;
+
+
+  typedef ROOT::Math::SMatrix<double, DIM,3> positionDerivativeType;
+
 
   virtual ~MultiTrackKinematicConstraintT() {}