--- UserCode/LJMet/Fix/interface/Muon.h	2010/09/10 00:19:24	1.1
+++ UserCode/LJMet/Fix/interface/Muon.h	2010/09/13 23:25:31	1.2
@@ -1,5 +1,5 @@
 //
-// $Id: Muon.h,v 1.1 2010/09/10 00:19:24 kukartse Exp $
+// $Id: Muon.h,v 1.2 2010/09/13 23:25:31 kukartse Exp $
 //
 
 #ifndef DataFormats_PatCandidates_Muon_h
@@ -17,7 +17,7 @@
 
   \author   Steven Lowette, Giovanni Petrucciani, Frederic Ronga, Colin Bernet
 
-  \version  $Id: Muon.h,v 1.1 2010/09/10 00:19:24 kukartse Exp $
+  \version  $Id: Muon.h,v 1.2 2010/09/13 23:25:31 kukartse Exp $
 */
 
 #include "DataFormats/MuonReco/interface/Muon.h"
@@ -147,10 +147,9 @@ namespace pat {
       /// global tracks. If the global track is present these should
       /// not be set, but the "getters" will return the appropriate
       /// value. The exception is dB which requires the beamline
-      /// as external input. 
-
-	// FIXME: modified by Gena Kukartsev
-	// embed various impact parameters with errors
+      //  as external input. 
+	
+	// ---- embed various impact parameters with errors ----
 	//
 	// example:
 	//
@@ -173,7 +172,7 @@ namespace pat {
 	  {
 	    None = 0, PV2D = 1, PV3D = 2, BS2D = 3, BS3D = 4
 	  } IpType; 
-	void init(void); // init defaults in a constructor
+	void initImpactParameters(void); // init IP defaults in a constructor
 	double dB(IpType type = None) const;
 	double edB(IpType type = None) const;
 	void   setDB ( double dB, double edB, IpType type = None ) 
@@ -238,17 +237,15 @@ namespace pat {
       bool    cachedNormChi2_;         /// has the normalized chi2 been cached?
       bool    cachedDB_;               /// has the dB been cached?
 
-	// FIXME: added by Gena Kukartsev
-      bool    cachedIP_[5];            /// has the IP (former dB) been cached?
-
       bool    cachedNumberOfValidHits_;/// has the numberOfValidHits been cached?
       double  normChi2_;               /// globalTrack->chi2() / globalTrack->ndof()
       double  dB_;                     /// dB and edB are the impact parameter at the primary vertex,
-      double  edB_;                    /// and its uncertainty as recommended by the tracking group
+      double  edB_;                    // and its uncertainty as recommended by the tracking group
 
-	// FIXME: added by Gena Kukartsev
-      double  ip_[5];                  /// dB and edB are the impact parameter at the primary vertex,
-      double  eip_[5];                 /// and its uncertainty as recommended by the tracking group
+      // ---- cached impact parameters ----
+      std::vector<bool>    cachedIP_;  // has the IP (former dB) been cached?
+      std::vector<double>  ip_;        // dB and edB are the impact parameter at the primary vertex,
+      std::vector<double>  eip_;       // and its uncertainty as recommended by the tracking group
 
       unsigned int  numberOfValidHits_;/// globalTrack->numberOfValidHits()