--- calo/flight/CaloPreSampler/inc/CaloPreSampler.h	2007/07/20 08:27:44	1.1.1.1
+++ calo/flight/CaloPreSampler/inc/CaloPreSampler.h	2007/11/26 08:53:46	1.4
@@ -44,19 +44,25 @@
     Bool_t simulation; ///< True when using simulated data, false by default;
     //
     CaloLevel0 *event; ///< CaloLevel0 event needed to process data from level0/1 to level2
-	//CaloLevel1 *c1; ///< CaloLevel1 event
     CaloStrip *cstrip; ///< CaloStrip object needed to easily recover parameter files
     CaloLevel2 *pcalo; ///< CaloLevel2 object which contains variables calculated with a reduced calorimeter.
+    //   CaloLevel1 *c1; ///< CaloLevel1 object which contains variables calculated with a reduced calorimeter.
     //
     Int_t N; ///< Number of W planes to be used as presampler. NOTICE: none the silicon detectors attached to these planes will be used;
     Bool_t sel; ///< Selection mode: planes from 1 to 22-N are used, plane 18 - N is masked if "emulate18" variable is true;
     Bool_t cont; ///< Contamination mode: planes from N to 22 are used;
     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
+    //
+    Float_t rigdefault; ///< Rigidity to be used if no track is available or in standalone mode
+    Bool_t withtrk; ///< Use or not the tracker
     //
 
  public:
     //
     //
+    // 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.
     //
     void SetNoWpreSampler(Int_t n){ N=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 = 3;
@@ -70,13 +76,19 @@
     ~CaloPreSampler(){ Delete(); };
     //
     void SetDebug(Bool_t d){ debug=d; };
+    void UseTracker(Bool_t ch){ withtrk = ch; };
+    void SetDefaultRig(Float_t rig){ rigdefault = rig; };
+    void MaskX(Bool_t mskx){ nox = mskx; };
+    void MaskY(Bool_t msky){ noy = msky; };
     //
     void Clear();
     void Clear(Option_t *option){Clear();};
     void Delete();
+    void Delete(Option_t *option){Delete();};
     //
     void Process(); ///< Process data 
     void Print();
+    void Print(Option_t *option){Print();};
     //
     ClassDef(CaloPreSampler,1);
 };