Fixes in the memory managment, additional protections

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

diff --git a/STEER/AliLHCTag.h b/STEER/AliLHCTag.h
index 5f82f634059cd04b8a5174e4b6cd12c8857b86ad..b52deaf16c3e44d620058ed709f3efb5f2216423 100644 (file)
--- a/STEER/AliLHCTag.h
+++ b/STEER/AliLHCTag.h
@@ -13,29 +13,28 @@
 //    Origin: Panos Christakoglou, UOA-CERN, Panos.Christakoglou@cern.ch
 //-------------------------------------------------------------------------
 
-#include <stdlib.h>
-#include <Riostream.h>
-
 #include "TObject.h"
-#include "TClonesArray.h"
+#include "TString.h"
 
 //______________________________________________________________________________
-class AliLHCTag : public TObject
-{
- private:
-  Char_t   fLHCState[50];                 //LHC run conditions - comments
-  Float_t  fLHCLuminosity;                //the value of the luminosity
-  
+class AliLHCTag : public TObject {
  public:
   AliLHCTag();
   virtual ~AliLHCTag();
   
-  void          SetLHCState(char *type) {strcpy(fLHCState,type);}
-  void          SetLuminosity(Float_t lumin) {fLHCLuminosity = lumin;}
-  void          SetLHCTag(Float_t lumin, char *type) {fLHCLuminosity = lumin; strcpy(fLHCState,type); }
+  //____________________________________________________//
+  void SetLHCState(TString type) {fLHCState = type;}
+  void SetLuminosity(Float_t lumin) {fLHCLuminosity = lumin;}
+  void SetLHCTag(Float_t lumin, TString type) {fLHCLuminosity = lumin; fLHCState = type; }
   
-  char         *GetLHCState() {return fLHCState;}
-  Float_t       GetLuminosity() {return fLHCLuminosity;}
+  //____________________________________________________//
+  const char *GetLHCState() {return fLHCState.Data();}
+  Float_t     GetLuminosity() const {return fLHCLuminosity;}
+  
+  //____________________________________________________//
+ private:
+  TString fLHCState;      //LHC run conditions - comments
+  Float_t fLHCLuminosity; //the value of the luminosity
   
   ClassDef(AliLHCTag,1)  //(ClassName, ClassVersion)
 };