X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCSensorTemp.cxx;h=167daca2f70b142417c1d7b5b78314087ef01717;hb=f2565a6b957b6554ff9bac368c652901bbbb5b42;hp=b265a88ab394445bcc828a22a11e14702732f6e3;hpb=a5c538738321f131e220a5f1433e5506e233b0ff;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCSensorTemp.cxx b/TPC/AliTPCSensorTemp.cxx
index b265a88ab39..167daca2f70 100644
--- a/TPC/AliTPCSensorTemp.cxx
+++ b/TPC/AliTPCSensorTemp.cxx
@@ -23,21 +23,22 @@
 
 // Running instructions:
 /*
-  TClonesArray * arr = AliTPCSensorTemp::ReadList("TempSensor.txt");
+  TClonesArray * arr = AliTPCSensorTemp::ReadList("TempSensor.txt","tpc_PT_%d.Temperature");
   TFile f("TempSensors.root","RECREATE");
   TTree * tree = new TTree("TempSensor", "TempSensor");
   tree->Branch("Temp",&arr);
   tree->Fill();
   tree->Write();
   
- */
+*/
+
 //
 
 #include <strings.h>
 #include "AliTPCSensorTemp.h"
 ClassImp(AliTPCSensorTemp)
 
-const char kAmandaString[] = "tpc_temp:PT_%d.Temperature";
+
 
 const Float_t kASideX[18][5]={
         { 99.56,  117.59,  160.82,  186.92,  213.11},
@@ -73,7 +74,7 @@ const Float_t kASideY[18][5]={
 	{-50.55,  -59.7,  -81.65,  -94.9, -108.2},
 	{-77.45,  -91.47, -125.1, -145.4, -165.77},
 	{-95.0, -112.2, -153.45, -178.35, -203.35},
-       {-101.1, -119.4, -163.3,  -189.8, -216.4},
+        {-101.1, -119.4, -163.3,  -189.8, -216.4},
         {-95.0, -112.2, -153.45, -178.35, -203.35},
 	{-77.45,  -91.47, -125.1, -145.4, -165.77},
 	{-50.55,  -59.7,  -81.65,  -94.9, -108.2},
@@ -113,7 +114,7 @@ const Float_t kCSideY[18][5]={
 	{-50.55,  -59.7,   -81.56,  -94.9,  -108.2},
 	{-77.45,  -91.47, -125.1,  -145.4,  -165.77},
 	{-95.0,  -112.2,  -153.45, -178.35, -203.35},
-       {-101.1, -119.4, -163.3, -189.8, -216.4},
+        {-101.1, -119.4, -163.3, -189.8, -216.4},
         {-95.0, -112.2, -153.45, -178.35, -203.35},
 	{-77.45,  -91.47, -125.1, -145.4, -165.77},
 	{-50.55,  -59.7,  -81.65,  -94.9, -108.2},
@@ -162,27 +163,29 @@ AliTPCSensorTemp& AliTPCSensorTemp::operator=(const AliTPCSensorTemp& source){
 }
 //______________________________________________________________________________________________
 
-TClonesArray * AliTPCSensorTemp::ReadList(const char *fname) {
+TClonesArray * AliTPCSensorTemp::ReadList(const char *fname,
+                                          const TString& amandaString) {
   //
   // read values from ascii file
   //
   TTree * tree = new TTree("asci","asci");
   tree->ReadFile(fname,"");
-  TClonesArray *arr = ReadTree(tree);
+  TClonesArray *arr = ReadTree(tree, amandaString);
   delete tree;
   return arr;
 }
      
 //______________________________________________________________________________________________
 
-TClonesArray * AliTPCSensorTemp::ReadTree(TTree *tree) {
+TClonesArray * AliTPCSensorTemp::ReadTree(TTree *tree, 
+                                          const TString& amandaString) {
   
   Int_t nentries = tree->GetEntries();
   Int_t sensor=0;
   Int_t sector=0;
   char  type[100];
   char  side[100];
-  Int_t num=0;
+  UInt_t num=0;
   Int_t echa=0;
   //Double_t x=0;
   //Double_t y=0;
@@ -209,7 +212,7 @@ TClonesArray * AliTPCSensorTemp::ReadTree(TTree *tree) {
     tree->GetEntry(isensor);
     temp->SetId(sensor);
     temp->SetIdDCS(echa);
-    TString stringID = Form (kAmandaString,echa);
+    TString stringID = Form (amandaString.Data(),echa);
     temp->SetStringID(stringID);
     if (side[0]=='C') temp->SetSide(1);
     temp->SetSector(sector);
@@ -326,13 +329,14 @@ TClonesArray * AliTPCSensorTemp::ReadTree(TTree *tree) {
       temp->SetZ(-240);
       }
 
-    if(temp->GetType()==5 && temp->GetSide()==0) {
+    if ( num < (sizeof(kTSz)/sizeof(kTSz[0]))) {
+      if(temp->GetType()==5 && temp->GetSide()==0) {
          temp->SetZ(kTSz[num]);
       }
-    if(temp->GetType()==5 && temp->GetSide()==1) {
+      if(temp->GetType()==5 && temp->GetSide()==1) {
          temp->SetZ(-kTSz[num]);
       }
-
+    }
 
   }
   return array;