Rounding off problem in rawData coding/decoding: solved

diff --git a/TOF/AliTOFDDLRawData.cxx b/TOF/AliTOFDDLRawData.cxx
index cff6cd5b208c27aa43bc041fad456a587ab863a5..949527b196b8160c462e1dd6de3a72014fecf8a5 100644 (file)
--- a/TOF/AliTOFDDLRawData.cxx
+++ b/TOF/AliTOFDDLRawData.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.13  2007/02/20 15:57:00  decaro
+Raw data update: to read the TOF raw data defined in UNPACKED mode
+
 Revision 1.12  2006/08/22 13:29:42  arcelli
 removal of effective c++ warnings (C.Zampolli)
 
@@ -994,10 +997,13 @@ void AliTOFDDLRawData::MakeTDCdigits(Int_t nDDL, Int_t nTRM, Int_t iChain,
            digs->GetPadx()  !=volume[3] ||
            digs->GetPadz()  !=volume[4]) AliWarning(" --- ERROR --- ");
 
-       timeOfFlight = (Int_t)(digs->GetTdc())%8192;
+       //timeOfFlight = (Int_t)(digs->GetTdc())%8192;
+       timeOfFlight = (Int_t)(digs->GetTdc());
+       if (timeOfFlight>=8192) timeOfFlight = 0;
+
        totCharge = (Int_t)(digs->GetToT());//digs->GetAdc();
        // temporary control
-       if (totCharge<0) totCharge = TMath::Abs(totCharge);
+       if (totCharge<0) totCharge = 0;//TMath::Abs(totCharge);
        if (totCharge>=256) totCharge = 255;
 
        if (fPackedAcquisition) {

diff --git a/TOF/AliTOFRawStream.h b/TOF/AliTOFRawStream.h
index f96a9e9ff3823655116f9507108e95cb336887be..9f9998158c904af77308362680c7467838db9e11 100644 (file)
--- a/TOF/AliTOFRawStream.h
+++ b/TOF/AliTOFRawStream.h
@@ -43,8 +43,8 @@ class AliTOFRawStream: public TObject {
   Int_t GetPadX()   const {return fPadX;};
   Int_t GetIndex(Int_t *detId); // Get channel index for Online Calibration 
   
-  Int_t GetTofBin() const {return fTime;};
-  Int_t GetToTbin() const {return fToT;};
+  Float_t GetTofBin() const {return fTime;};
+  Float_t GetToTbin() const {return fToT;};
   Float_t GetLeadingEdge() const {return fLeadingEdge;};
   Float_t GetTrailingEdge() const {return fTrailingEdge;};
 
@@ -91,8 +91,8 @@ class AliTOFRawStream: public TObject {
   Int_t         fTRMchain;     // TRM chain number [0;1]
   Int_t         fTDC;          // TDC number [0;14]
   Int_t         fTDCchannel;   // TDC channel number [0;7]
-  Int_t         fTime;         // time-of-flight measurement [0;8191]
-  Int_t         fToT;          // time-over-threshould measurement [0;255]
+  Float_t       fTime;         // time-of-flight measurement [0;8191]
+  Float_t       fToT;          // time-over-threshould measurement [0;255]
   Float_t       fLeadingEdge;  // leading edge measurement
   Float_t       fTrailingEdge; // trailing edge measurement
   Int_t         fErrorFlag;    // error flag

diff --git a/TOF/AliTOFrawData.cxx b/TOF/AliTOFrawData.cxx
index 7b78996614979e918a3b2a821e2a05be5bf6b3ec..b22ce03fd538cf62b5efea5738b2c8390c58ae0e 100644 (file)
--- a/TOF/AliTOFrawData.cxx
+++ b/TOF/AliTOFrawData.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.1  2007/02/20 15:57:00  decaro
+Raw data update: to read the TOF raw data defined in UNPACKED mode
+
 Revision 0.1  2006/12/15 A.De Caro
    Introuction
 */
@@ -53,8 +56,8 @@ AliTOFrawData::AliTOFrawData() :
 }
 
 //_____________________________________________________________________________
-AliTOFrawData::AliTOFrawData(Int_t a, Int_t b, Int_t c, Int_t d, Int_t e,
-                            Int_t f, Int_t g, Int_t h, Int_t l) :
+AliTOFrawData::AliTOFrawData(Int_t a, Int_t b, Int_t c, Int_t d, Float_t e,
+                            Float_t f, Int_t g, Int_t h, Int_t l) :
   TObject(),
   fACQflag(h),
   fPSbit(g),
@@ -74,8 +77,8 @@ AliTOFrawData::AliTOFrawData(Int_t a, Int_t b, Int_t c, Int_t d, Int_t e,
 }
 
 //_____________________________________________________________________________
-AliTOFrawData::AliTOFrawData(Int_t a, Int_t b, Int_t c, Int_t d, Int_t e,
-                            Int_t f, Float_t ee, Float_t ff, Int_t g, Int_t h, Int_t l) :
+AliTOFrawData::AliTOFrawData(Int_t a, Int_t b, Int_t c, Int_t d, Float_t e,
+                            Float_t f, Float_t ee, Float_t ff, Int_t g, Int_t h, Int_t l) :
   TObject(),
   fACQflag(h),
   fPSbit(g),

diff --git a/TOF/AliTOFrawData.h b/TOF/AliTOFrawData.h
index 6c66428fc7f7f1cbaf4a3d9c9b628c0f26702729..017ed80b92af3481e0d4b1f2f146dd6aebe0ce7e 100644 (file)
--- a/TOF/AliTOFrawData.h
+++ b/TOF/AliTOFrawData.h
@@ -17,8 +17,8 @@ class AliTOFrawData : public TObject {
   // TOF rawData class
  public:
   AliTOFrawData(); // default ctr
-  AliTOFrawData(Int_t a, Int_t b, Int_t c, Int_t d, Int_t e, Int_t f, Int_t g, Int_t h, Int_t l); // ctr
-  AliTOFrawData(Int_t a, Int_t b, Int_t c, Int_t d, Int_t e, Int_t f, Float_t ee, Float_t ff, Int_t g, Int_t h, Int_t l); // ctr
+  AliTOFrawData(Int_t a, Int_t b, Int_t c, Int_t d, Float_t e, Float_t f, Int_t g, Int_t h, Int_t l); // ctr
+  AliTOFrawData(Int_t a, Int_t b, Int_t c, Int_t d, Float_t e, Float_t f, Float_t ee, Float_t ff, Int_t g, Int_t h, Int_t l); // ctr
   ~AliTOFrawData() {}; // default dtr
   AliTOFrawData(const AliTOFrawData& r);     // dummy copy constructor
   AliTOFrawData& operator=(const AliTOFrawData& r); // dummy assignment operator