--- calo/flight/CaloPreSampler/inc/CaloPreSampler.h	2007/12/02 19:38:09	1.5
+++ calo/flight/CaloPreSampler/inc/CaloPreSampler.h	2009/07/27 13:58:57	1.10
@@ -53,9 +53,12 @@
     Bool_t emulate18; ///< If true emulates the non-working plane 18;
     Bool_t nox; ///< If true do not use X-view
     Bool_t noy; ///< If true do not use Y-view
+    Bool_t forcecalo;
+    Int_t mask[2][22];
     //
     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:
@@ -66,6 +69,7 @@
     //
     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);
+    void SplitInto(Int_t NoWpreSampler, Int_t NoWcalo);
     void Selection(){sel = true; cont = false;}; ///< Set selection mode: planes from 1 to 22-N are used, plane 18 - N is masked if "emulate18" variable is true (DEFAULT);
     void Contamination(){sel = false; cont = true;}; ///< Set contamination mode: planes from N to 22 are used.
     void EmulatePlane18(Bool_t emu){emulate18 = emu;} ///< Emulates the non-working plane 18; Default = true;
@@ -80,8 +84,11 @@
     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 Clear();
     void Clear(Option_t *option){Clear();};
@@ -92,6 +99,8 @@
     void Print();
     void Print(Option_t *option){Print();};
     //
+    CaloTrkVar* AddCaloTrkVar(float *al,int trktag);//ELENA
+
     ClassDef(CaloPreSampler,2);
 };