--- calo/flight/CaloPreSampler/inc/CaloPreSampler.h	2008/12/18 20:57:57	1.8
+++ calo/flight/CaloPreSampler/inc/CaloPreSampler.h	2010/03/10 12:11:10	1.17
@@ -39,6 +39,8 @@
     UInt_t atime;
     Bool_t ssel;
     //
+    Bool_t usepl18x;
+    //
     Bool_t simulation; ///< True when using simulated data, false by default;
     //
     CaloLevel0 *event; ///< CaloLevel0 event needed to process data from level0/1 to level2
@@ -58,6 +60,7 @@
     //
     Float_t rigdefault; ///< Rigidity to be used if no track is available or in standalone mode
     Bool_t withtrk; ///< Use or not the tracker
+    Int_t forcefitmode;
     //
 
  public:
@@ -65,6 +68,11 @@
     //
     // CaloLevel1* GetCaloLevel1(){ Process(); return c1;}; ///< Retrieve CaloLevel1 pointer which contains variables calculated with a reduced calorimeter.
     CaloLevel2* GetCaloLevel2(){ Process(); return pcalo;}; ///< Retrieve CaloLevel2 pointer which contains variables calculated with a reduced calorimeter.
+    CaloLevel2* GetLevel2Pointer(){ printf(" OBSOLETE, use GetCaloLevel2Pointer()!\n"); return pcalo;}; ///< Retrieve CaloLevel2 pointer which contains variables calculated with a reduced calorimeter.
+    CaloLevel2* GetCaloLevel2Pointer(){ return pcalo;}; ///< Retrieve CaloLevel2 pointer which contains variables calculated with a reduced calorimeter.
+    void SetCaloLevel2Pointer(CaloLevel2 *); ///< Set CaloLevel2 pointer which contains variables calculated with a reduced calorimeter.
+    //
+    CaloTrkVar* GetCaloTrack(Int_t t);
     //
     void SetNoWpreSampler(Int_t n); ///< Set the number of W planes to be used as presampler. NOTICE: none the silicon detectors attached to these planes will be used. Default: N = 4;
     void SetNoWcalo(Int_t n); ///< Set the number of W planes to be used as calorimeter. Default: NC = 22-N (N presampler);
@@ -83,10 +91,14 @@
     void SetDebug(Bool_t d){ debug=d; };
     void UseTracker(Bool_t ch){ withtrk = ch; };
     void SetDefaultRig(Float_t rig){ rigdefault = rig; };
+    void SetForceFitMode(Int_t mode){ forcefitmode = mode; };
     void MaskX(Bool_t mskx){ nox = mskx; };
     void MaskY(Bool_t msky){ noy = msky; };
     void Mask(Int_t view, Int_t plane){ mask[view][plane] = 1;};
     void ForceCaloFit(){forcecalo=true;};
+    void ForceNextProc(){atime=0;};
+    //
+    void UsePlane18X(Bool_t use){usepl18x = use;};
     //
     void Clear();
     void Clear(Option_t *option){Clear();};
@@ -97,7 +109,9 @@
     void Print();
     void Print(Option_t *option){Print();};
     //
-    ClassDef(CaloPreSampler,2);
+    CaloTrkVar* AddCaloTrkVar(float *al,int trktag);//ELENA
+
+    ClassDef(CaloPreSampler,4);
 };
 
 #endif