--- PamelaDigitizer/Digitizer.h	2009/05/05 14:17:46	1.11
+++ PamelaDigitizer/Digitizer.h	2009/11/13 09:08:54	1.14
@@ -2,6 +2,7 @@
 #define DIGITIZER_H
 
 #include <iostream>
+#include <istream>
 #include <fstream>
 
 
@@ -45,6 +46,7 @@
     int *ncal;
     int *nnd;
     int *nstr;
+    int *comprcalomod;
 
     static const int fPSCUbuffer = 8;
     static const int fTRIGGERbuffer = 152; //(bytes)
@@ -102,7 +104,7 @@
     UShort_t fSecCalo[4];
     UShort_t fSecCALOLength[4];
     UShort_t fCALOlength;
-    UShort_t fModCalo;
+    UShort_t fModCalo ; //  0 is RAW, 1 is COMPRESS, 2 is FULL
     Float_t fCalomip[2][22][96]; // ADC to MIP conversion values
     Float_t fcalped[4][11][96]; // pedestals
     Float_t fcalgood[4][11][96]; // used or not in the common noise calculation
@@ -117,6 +119,7 @@
     char* fFilename;
     UInt_t fLen;
    
+    UInt_t fEvent ; // cecilia, current evt nr
 
 
     //  vectors, buffer, and variables for tracker
@@ -381,7 +384,7 @@
     TF1 *attenAC;
  public: 
 
-    Digitizer(TTree*,char*&,int,int,int,int,int,int,int,int); // constructor
+    Digitizer(TTree*,char*&,int,int,int,int,int,int,int,int,int); // constructor
 
     void Close();
     void SetTree(TTree *tree) {fhBookTree = tree;};
@@ -432,6 +435,11 @@
     Float_t SaturationTracky(Float_t ADC); // Saturation simulation
     //  end methods for Tracker
 
+    // AC Methods
+    UShort_t EvaluateCrcAC( UShort_t* , Bool_t );
+    UShort_t crcAC(UShort_t, UShort_t);
+    
+
     void WriteData(); // writes data to file
     void ReadData();