Status flag implemented as UChar_t

diff --git a/TOF/AliTOFChannelOnline.cxx b/TOF/AliTOFChannelOnline.cxx
index e324791ef4ac3ba2a8446d1907bd0392197f9ba0..381ec8d92559d17a10610e8f658c886f3bf4b071 100644 (file)
--- a/TOF/AliTOFChannelOnline.cxx
+++ b/TOF/AliTOFChannelOnline.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.1  2006/10/26 09:13:24  arcelli
+ TOF Online Calibration channel (C.Zampolli)
+
 */  
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -29,14 +32,14 @@ ClassImp(AliTOFChannelOnline)
 
 //________________________________________________________________
 AliTOFChannelOnline::AliTOFChannelOnline():
-fStatus(kFALSE),
+fStatus(kTOFOnlineUnknown),
 fDelay(0)
 {
   //default constructor
 }
 
 //________________________________________________________________
-AliTOFChannelOnline::AliTOFChannelOnline(Bool_t status, Float_t delay):
+AliTOFChannelOnline::AliTOFChannelOnline(UChar_t status, Float_t delay):
 fStatus(status),
 fDelay(delay)
 {
@@ -46,7 +49,7 @@ fDelay(delay)
 //________________________________________________________________
 AliTOFChannelOnline::AliTOFChannelOnline(const AliTOFChannelOnline& channel) :
   TObject(channel),
-  fStatus(kFALSE),
+  fStatus(kTOFOnlineUnknown),
   fDelay(0)
 {
 // copy constructor

diff --git a/TOF/AliTOFChannelOnline.h b/TOF/AliTOFChannelOnline.h
index df97b31cd575cc80e549fcd5b6d58e646da0a58a..b226d5fc3aa174d99b9f72b705a623619514e9f3 100644 (file)
--- a/TOF/AliTOFChannelOnline.h
+++ b/TOF/AliTOFChannelOnline.h
@@ -14,20 +14,31 @@ class AliTOFChannelOnline: public TObject {
 
 public:
   AliTOFChannelOnline();
-  AliTOFChannelOnline(Bool_t status, Float_t delay);
+  AliTOFChannelOnline(UChar_t status, Float_t delay);
   AliTOFChannelOnline(const AliTOFChannelOnline &chan);
   AliTOFChannelOnline& operator= (const AliTOFChannelOnline &chan);
   virtual ~AliTOFChannelOnline(){};
-  Bool_t   GetStatus()         const {return fStatus;}
+  UChar_t  GetStatus()         const {return fStatus;}
   Float_t  GetDelay()          const {return fDelay;}
-  void    SetStatus(Bool_t status) {fStatus=status;}
+  void    SetStatus(UChar_t status) {fStatus=status;}
   void     SetDelay(Float_t val) {fDelay=val;}
 
+  enum{
+    kTOFOnlineUnknown=0x0, kTOFOnlineOk=0x2a, kTOFOnlineBad=0x15, 
+      kTOFHWOk=0x1, kTOFHWBad=0x2, kTOFHVUnknown=0x0,
+      kTOFPulserOk=0x4, kTOFPulserBad=0x8, kTOFPulserUnknown=0x0,
+      kTOFNoiseOk=0x10, kTOFNoiseBad=0x20, kTOFNoiseUnknown=0x0
+      };
+  
+  enum{
+    kRightShiftHW=0,kRightShiftPulser=2,kRightShiftNoise=4
+      };
+
 private:
-  Bool_t   fStatus;     // Status of the channel (0:on 1:off)
+  UChar_t  fStatus;     // Status of the channel (0:on 1:off)
   Float_t  fDelay;     // Delay
   //
-  ClassDef(AliTOFChannelOnline,1)    // TOF Sensor Online Calibration object
+  ClassDef(AliTOFChannelOnline,2)    // TOF Sensor Online Calibration object
 };
 
 #endif

diff --git a/TOF/AliTOFClusterFinder.cxx b/TOF/AliTOFClusterFinder.cxx
index 05e7b23b2f4c4045fa24aa4fb8afcda9125e805f..cd78f2e4dc842322fe1724c129990654e7e7aac8 100644 (file)
--- a/TOF/AliTOFClusterFinder.cxx
+++ b/TOF/AliTOFClusterFinder.cxx
@@ -15,6 +15,9 @@
 
 /* 
 $Log$
+Revision 1.30  2007/10/04 13:08:52  arcelli
+updates to comply with AliTOFGeometryV5 becoming AliTOFGeometry
+
 Revision 1.29  2007/10/03 10:42:33  arcelli
 updates to handle new AliTOFcluster, inheriting form AliCluster3D
 
@@ -946,8 +949,8 @@ void AliTOFClusterFinder::CalibrateRecPoint()
     AliTOFChannelOnline * calChannelOnline = (AliTOFChannelOnline* )calTOFArrayOnline->At(index);
 
     // Get channel status 
-    Bool_t status=calChannelOnline->GetStatus();
-    if(status)fTofClusters[ii]->SetStatus(!status); //odd convention, to avoid conflict with calibration objects currently in the db (temporary solution).
+    UChar_t status=calChannelOnline->GetStatus();
+    if((status & AliTOFChannelOnline::kTOFOnlineOk)!=(AliTOFChannelOnline::kTOFOnlineOk))fTofClusters[ii]->SetStatus(kFALSE); //odd convention, to avoid conflict with calibration objects currently in the db (temporary solution).
     // Get Rough channel online equalization 
     Double_t roughDelay=(Double_t)calChannelOnline->GetDelay();  // in ns
     AliDebug(2,Form(" channel delay (ns) = %f", roughDelay));