Rename cons string to avoid interference with a string in EMCAL (Root6)

diff --git a/HLT/pendolino/PredictionProcessor/TPC/AliHLTPredictionProcessorTPC.cxx b/HLT/pendolino/PredictionProcessor/TPC/AliHLTPredictionProcessorTPC.cxx
index 71fe50ed879d0c064334857b3427bf1e56bee135..fe0d2212dc364099c89d6b056902ffe91e66a9ea 100644 (file)
--- a/HLT/pendolino/PredictionProcessor/TPC/AliHLTPredictionProcessorTPC.cxx
+++ b/HLT/pendolino/PredictionProcessor/TPC/AliHLTPredictionProcessorTPC.cxx
@@ -210,7 +210,7 @@ TMap* AliHLTPredictionProcessorTPC::produceTestData(TString aliasName)
 
     for (Int_t isensor=0; isensor<nentries; isensor++ ){
       fConfTreeTemp->GetEntry(isensor);
-      stringId = Form(kAmandaString.Data(),echa);
+      stringId = Form(kAmandaStringTPC.Data(),echa);
       tempDelta = (random.Rndm()-0.5)*tempVar;
       temp = defTemp + tempDelta;
       AliDCSValue* val = new AliDCSValue(temp, tt.GetTime());

diff --git a/TPC/Base/AliTPCSensorTemp.h b/TPC/Base/AliTPCSensorTemp.h
index 04805ab488f4e96e0bf92e183719689c1bb0475a..ea10cfc5c53ef83be31da5aa5a15d2fbd09aecb7 100644 (file)
--- a/TPC/Base/AliTPCSensorTemp.h
+++ b/TPC/Base/AliTPCSensorTemp.h
@@ -28,7 +28,7 @@ class TTimeStamp;
 //              Class AliTPCSensorTempSensors
 ////////////////////////////////////////////////////////////////////////
 
-const TString kAmandaString = "tpc_temp:PT_%d.Temperature";
+const TString kAmandaStringTPC = "tpc_temp:PT_%d.Temperature";
 
 class AliTPCSensorTemp : public AliDCSSensor {
 
@@ -50,9 +50,9 @@ public:
 
 
   static TClonesArray * ReadList(const char *fname,
-                                 const TString& amandaString = kAmandaString);
+                                 const TString& amandaString = kAmandaStringTPC);
   static TClonesArray * ReadTree(TTree *tree, 
-                                 const TString& amandaString = kAmandaString);
+                                 const TString& amandaString = kAmandaStringTPC);
 
 protected:
   Int_t fType;      // Position of sensors on fieldcage

diff --git a/TPC/Base/AliTPCSensorTempArray.h b/TPC/Base/AliTPCSensorTempArray.h
index fef11bc8131d017818e376e6544f33ba2707b909..164d6d9a5ea74c5105f4acf048ee8af1ea83ad5d 100644 (file)
--- a/TPC/Base/AliTPCSensorTempArray.h
+++ b/TPC/Base/AliTPCSensorTempArray.h
@@ -30,9 +30,9 @@ class AliTPCSensorTempArray : public AliDCSSensorArray {
   AliTPCSensorTempArray();
   AliTPCSensorTempArray(Int_t run);
   AliTPCSensorTempArray(const char *fname,
-                        const TString& amandaString = kAmandaString);
+                        const TString& amandaString = kAmandaStringTPC);
   AliTPCSensorTempArray (UInt_t startTime, UInt_t endTime, TTree* confTree,
-                         const TString& amandaString = kAmandaString);
+                         const TString& amandaString = kAmandaStringTPC);
   AliTPCSensorTempArray(const AliTPCSensorTempArray &c);
   virtual ~AliTPCSensorTempArray();
   AliTPCSensorTempArray &operator=(const AliTPCSensorTempArray &c);