Correcting fot BEAM2 phase and using L0 for timing

[u/mrichter/AliRoot.git] / TPC / AliTPCSensorTemp.cxx

diff --git a/TPC/AliTPCSensorTemp.cxx b/TPC/AliTPCSensorTemp.cxx
index 63c5f7a0c9452493645ff1ae996367d65f353f8d..167daca2f70b142417c1d7b5b78314087ef01717 100644 (file)
--- a/TPC/AliTPCSensorTemp.cxx
+++ b/TPC/AliTPCSensorTemp.cxx
@@ -23,17 +23,18 @@
 
 // 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)
 
@@ -162,13 +163,14 @@ 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;
 }
@@ -183,7 +185,7 @@ TClonesArray * AliTPCSensorTemp::ReadTree(TTree *tree,
   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;
@@ -327,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;