--- calo/flight/CaloNuclei/inc/CaloNuclei.h	2007/11/26 08:48:23	1.6
+++ calo/flight/CaloNuclei/inc/CaloNuclei.h	2015/04/20 09:12:04	1.10
@@ -34,6 +34,8 @@
     PamLevel2 *L2;
     Bool_t debug;
     Bool_t usetrack;
+    const char*  trkAlg;
+    
     //
     // needed to avoid reprocessing the same event over and over to obtain the variables
     //
@@ -43,6 +45,8 @@
     Int_t tr;
     Int_t sntr;
     //
+    Bool_t usepl18x;
+    //
     Int_t interplane; ///< Number of available dE/dx measurements before interaction or exit from the calo (interaction plane) 
     Int_t N; ///< Number of dE/dx measurements to be used to calculate qpremeanN, default N = 5
     Int_t R; ///< Number of strip to be used around the trajectory to calculate qpremeanN, default R = 3
@@ -54,14 +58,24 @@
     Float_t dedx3; ///< Energy release (MIP) along the track on the first three Silicon detectors (Y EVEN, X EVEN, Y ODD).
     Float_t qpremean; ///< Truncated mean (MIP) along the track up to the interaction plane preq using three points
     Float_t qpremeanN; ///< Truncated mean (MIP) along the track up to the interaction plane preq using N points
+    Float_t qNmin1; ///< Truncated mean (MIP) along the track using N-1 measurements before of the interaction plane
+    Float_t maxrel; ///<Energy maximum release on first Calorimeter plane (dedx of strip with maximum release)
     Float_t ethr; ///< Threshold (MIP) needed to find the interaction plane
     Bool_t multhit; ///< True if the interaction plane has been determined by multiple hit counting
     Bool_t gap; ///< True if determining the interaction plane a big (>5 planes) gap has been found between a point and another along the track
-    //
-
+    Float_t charge_siegen1; 
+    Float_t ZCalo_dedx_b;  //Z from Calo using dedx in first Calorimeter plane vs. beta
+    Float_t ZCalo_maxrel_b; //Z from Calo using maximum release in first Calorimeter plane vs. beta 
+    Float_t ZCalo_dedx_defl; //Z from Calo using dedx in first Calorimeter plane vs. rigidity
+    Float_t ZCalo_Nmin1_defl;  //Z from Calo using truncated mean on N-1 Calorimeter planes (plane N+1 is the interaction plane) vs. rigidity
+   //
+    Float_t qNmin1_w;
+    Int_t S2;
  public:
     //
     //
+    //char* version();
+
     Int_t Get_interplane(){ Process(); return interplane;}; ///< Number of available dE/dx measurements before interaction or exit from the calo (interaction plane) 
     Int_t Get_N(){ return N;}; ///< Number of dE/dx measurements to be used to calculate qpremeanN, default N = 5
     Int_t Get_UsedN(){ return UN;}; ///< Number of dE/dx measurements really used to calculate qpremeanN
@@ -73,18 +87,31 @@
     Float_t Get_dEdx3(){ Process(); return dedx3;}; ///< Energy release (MIP) along the track on the first three Silicon detectors (Y EVEN, X EVEN, Y ODD).
     Float_t Get_qpremean(){ Process(); return qpremean;}; ///< Truncated mean (MIP) along the track up to the interaction plane preq using three points
     Float_t Get_qpremeanN(){ Process(); return qpremeanN;}; ///< Truncated mean (MIP) along the track up to the interaction plane preq using N points
+    Float_t Get_qNmin1(){ Process(); return qNmin1;}; ///< Truncated mean (MIP) along the track using N-1 measurements before of the interaction plane
+    Float_t Get_maxrel(){ Process(); return maxrel;}; ///<Energy maximum release on first Calorimeter plane (dedx of strip with maximum release)
     Float_t Get_ethr(){ Process(); return ethr;}; ///< Threshold (MIP) needed to find the interaction plane
     Bool_t IsMulthit(){ Process(); return multhit;}; ///< True if the interaction plane has been determined by multiple hit counting
     //
+    Float_t Get_charge_siegen1(){ Process(); return charge_siegen1;}; ///< charge Siegen method stdedx1 vs. beta
+    Float_t Get_ZCalo_dedx_b(){ Process(); return ZCalo_dedx_b;};  //Z from Calo using dedx (or StdEdx) in first Calorimeter plane vs. beta
+    Float_t Get_ZCalo_maxrel_b(){ Process(); return ZCalo_maxrel_b;}; //Z from Calo using maximum release in first Calorimeter plane vs. beta 
+    Float_t Get_ZCalo_dedx_defl(){ Process(); return ZCalo_dedx_defl;}; //Z from Calo using dedx in first Calorimeter plane vs. rigidity
+    Float_t Get_ZCalo_Nmin1_defl(){ Process(); return ZCalo_Nmin1_defl;};  //Z from Calo using truncated mean on N-1 Calorimeter planes (plane N+1 is the interaction plane) vs. rigidity
+    
+    //
     void Set_N(Int_t n){ N=n;};
     void Set_R(Int_t r){ R=r;};
     //
-    CaloNuclei();
-    CaloNuclei(PamLevel2 *L2);
+//    CaloNuclei();
+    CaloNuclei(PamLevel2 *L2,const char* alg);
     ~CaloNuclei(){ Delete(); };
     //
     void SetDebug(Bool_t d){ debug=d; };
     void UseTrack(Bool_t d){ usetrack=d; };
+
+
+    void UsePlane18X(Bool_t use){usepl18x = use;};
+    //
     //
     void Clear();
     void Clear(Option_t *option){Clear();};
@@ -96,7 +123,7 @@
     void Print();
     void Print(Option_t *option){Print();};
     //
-    ClassDef(CaloNuclei,2);
+    ClassDef(CaloNuclei,3);
 };
 
 #endif