Bug fix

[u/mrichter/AliRoot.git] / STEER / AliDCSValue.h

diff --git a/STEER/AliDCSValue.h b/STEER/AliDCSValue.h
index 016647d58bba93b33191361f469b57dd312d1495..80c82f7486facb7a620696e855049adfe922cd2c 100644 (file)
--- a/STEER/AliDCSValue.h
+++ b/STEER/AliDCSValue.h
@@ -7,37 +7,67 @@
 /* $Id$ */
 
 //
-// This class represents the main value structure
-// which forms so called 'historical data' in any SCADA system.
+// This class represents the value(s) of a DCS data point at a given timestamp
 //
 
-#include "AliSimpleValue.h"
+#include <TObject.h>
 
-class AliDCSValue: public TObject {
+class AliDCSValue : public TObject {
 public:
+  enum Type {
+    kInvalid = 0,
 
-       AliDCSValue();
-       AliDCSValue(const AliSimpleValue& value, UInt_t timeStamp);
+    kBool = 1,
+    kChar = 2,
+    kInt = 3,
+    kUInt = 4,
+    kFloat = 5
+  };
 
-       AliSimpleValue& GetSimpleValue() {return fValue;};
-       const AliSimpleValue& GetSimpleValue() const {return fValue;};  
-       void SetSimpleValue(const AliSimpleValue& value) {fValue = value;};
+  AliDCSValue();
+  AliDCSValue(const AliDCSValue& c);
 
-       UInt_t GetTimeStamp() const {return fTimeStamp;};
-       void SetTimeStamp(UInt_t timeStamp) {fTimeStamp = timeStamp;};
+  virtual ~AliDCSValue();
 
-       Int_t GetSize() const {return fValue.GetSize() + sizeof(UInt_t);};
+  AliDCSValue& operator=(const AliDCSValue& c);
+  virtual void Copy(TObject& c) const;
 
-       TString ToString() const;
+  AliDCSValue(Bool_t value, UInt_t timeStamp);
+  AliDCSValue(Char_t value, UInt_t timeStamp);
+  AliDCSValue(Int_t value, UInt_t timeStamp);
+  AliDCSValue(UInt_t value, UInt_t timeStamp);
+  AliDCSValue(Float_t value, UInt_t timeStamp);
 
-private:
+  Bool_t GetBool() const { return fBool; }
+  Char_t GetChar() const { return fChar; }
+  Int_t GetInt() const { return fInt; }
+  UInt_t GetUInt() const { return fUInt; }
+  Float_t GetFloat() const { return fFloat; }
 
-        AliSimpleValue fValue;
+  Type GetType() const { return fType; }
 
-        UInt_t fTimeStamp;
+  UInt_t GetTimeStamp() const { return fTimeStamp; }
+  void SetTimeStamp(UInt_t timeStamp) { fTimeStamp = timeStamp; }
 
+  Int_t GetSize() const;
 
-       ClassDef(AliDCSValue, 1);
+  const Char_t* ToString() const;
+       void Print(Option_t* /*opt*/) const;
+
+protected:
+  void Init();
+
+  Type fType;           // type of the value stored
+
+  Bool_t fBool;         // bool value
+  Char_t fChar;         // char value
+  Int_t fInt;           // int value
+  UInt_t fUInt;         // uint value
+  Float_t fFloat;       // float value
+
+  UInt_t fTimeStamp;    // timestamp of this value
+
+       ClassDef(AliDCSValue, 2);
 };
 
 #endif