Analysis code updated

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

diff --git a/TPC/AliTPCclustererKr.cxx b/TPC/AliTPCclustererKr.cxx
index f40bf38188aa3f8f3806e27713d98c60ae19abbb..8c1eba17d9912718013c13a10eeff96ea4f15db5 100644 (file)
--- a/TPC/AliTPCclustererKr.cxx
+++ b/TPC/AliTPCclustererKr.cxx
@@ -233,6 +233,10 @@ delete stream;
 #include "AliTPCCalROC.h"\r
 #include "AliRawEventHeaderBase.h"\r
 \r
+using std::cerr;\r
+using std::cout;\r
+using std::endl;\r
+using std::list;\r
 ClassImp(AliTPCclustererKr)\r
 \r
 \r
@@ -262,8 +266,9 @@ AliTPCclustererKr::AliTPCclustererKr()
   fHistoRow(0),\r
   fHistoPad(0),\r
   fHistoTime(0),\r
-  fHistoRowPad(0),\r
-  fTimeStamp(0)\r
+   fHistoRowPad(0),\r
+   fTimeStamp(0),\r
+  fRun(0)\r
 {\r
 //\r
 // default constructor\r
@@ -297,7 +302,8 @@ AliTPCclustererKr::AliTPCclustererKr(const AliTPCclustererKr &param)
   fHistoPad(0),\r
   fHistoTime(0),\r
   fHistoRowPad(0),\r
-  fTimeStamp(0)\r
+   fTimeStamp(0),\r
+   fRun(0)\r
 {\r
 //\r
 // copy constructor\r
@@ -328,6 +334,7 @@ AliTPCclustererKr::AliTPCclustererKr(const AliTPCclustererKr &param)
   fHistoTime   = param.fHistoTime;\r
   fHistoRowPad = param.fHistoRowPad;\r
   fTimeStamp = param.fTimeStamp;\r
+  fRun = param.fRun;\r
 \r
 } \r
 \r
@@ -336,6 +343,8 @@ AliTPCclustererKr & AliTPCclustererKr::operator = (const AliTPCclustererKr & par
   //\r
   // assignment operator\r
   //\r
+  if (this == &param) return (*this);\r
+  \r
   fParam = param.fParam;\r
   fRecoParam = param.fRecoParam;\r
   fRawData = param.fRawData;\r
@@ -362,6 +371,7 @@ AliTPCclustererKr & AliTPCclustererKr::operator = (const AliTPCclustererKr & par
   fHistoTime   = param.fHistoTime;\r
   fHistoRowPad = param.fHistoRowPad;\r
   fTimeStamp = param.fTimeStamp;\r
+  fRun = param.fRun;\r
   return (*this);\r
 }\r
 \r
@@ -439,8 +449,9 @@ Int_t AliTPCclustererKr::FinderIO(AliRawReader* rawReader)
   // Krypton cluster finder for the TPC raw data\r
   // this method is unsing AliAltroRawStreamV3\r
   // fParam must be defined before\r
-  \r
-  if(rawReader)fRawData=kTRUE; //set flag to data\r
+  if (!rawReader) return 1;\r
+  //\r
+  fRawData=kTRUE; //set flag to data\r
   \r
   if (!fOutput) {\r
     Error("Digits2Clusters", "output tree not initialised");\r
@@ -453,6 +464,7 @@ Int_t AliTPCclustererKr::FinderIO(AliRawReader* rawReader)
   AliRawEventHeaderBase* eventHeader = (AliRawEventHeaderBase*)rawReader->GetEventHeader();\r
   if (eventHeader){\r
     fTimeStamp = eventHeader->Get("Timestamp");\r
+    fRun = rawReader->GetRunNumber();\r
   }\r
 \r
 \r
@@ -612,7 +624,8 @@ Int_t AliTPCclustererKr::FinderIOold(AliRawReader* rawReader)
   // Krypton cluster finder for the TPC raw data\r
   //\r
   // fParam must be defined before\r
-  \r
+  if (!rawReader) return 1;\r
+\r
   if(rawReader)fRawData=kTRUE; //set flag to data\r
   \r
   if (!fOutput) {\r
@@ -626,6 +639,7 @@ Int_t AliTPCclustererKr::FinderIOold(AliRawReader* rawReader)
   AliRawEventHeaderBase* eventHeader = (AliRawEventHeaderBase*)rawReader->GetEventHeader();\r
   if (eventHeader){\r
     fTimeStamp = eventHeader->Get("Timestamp");\r
+    fRun = rawReader->GetRunNumber();\r
   }\r
   \r
   Bool_t isAltro=kFALSE;\r
@@ -879,8 +893,9 @@ Int_t AliTPCclustererKr::FindClusterKrIO()
                //GetXY(iSec,iRow,iPad,xCord,yCord);\r
                Double_t x[]={iRow,iPad,iTimeBin};\r
                Int_t i[]={iSec};\r
-               AliTPCTransform trafo;\r
-               trafo.Transform(x,i,0,1);\r
+               AliTPCTransform *transform     = AliTPCcalibDB::Instance()->GetTransform() ;\r
+\r
+               transform->Transform(x,i,0,1);\r
                \r
                AliPadMax *oneMaximum = new AliPadMax(AliTPCvtpr(valueMaximum,\r
                                                                 timeBinMax,\r
@@ -927,8 +942,13 @@ Int_t AliTPCclustererKr::FindClusterKrIO()
              //GetXY(iSec,iRow,iPad,xCord,yCord);\r
              Double_t x[]={iRow,iPad,iTimeBin};\r
              Int_t i[]={iSec};\r
-             AliTPCTransform trafo;\r
-             trafo.Transform(x,i,0,1);\r
+             //AliTPCTransform trafo;\r
+             //trafo.Transform(x,i,0,1);\r
+\r
+               AliTPCTransform *transform     = AliTPCcalibDB::Instance()->GetTransform() ;\r
+\r
+               transform->Transform(x,i,0,1);\r
+\r
              AliPadMax *oneMaximum = new AliPadMax(AliTPCvtpr(valueMaximum,\r
                                                               timeBinMax,\r
                                                               iPad,\r
@@ -1093,6 +1113,7 @@ void AliTPCclustererKr::MakeClusters(TObjArray * maximaInSector, Int_t iSec, Int
     clusterKr.Set1D();//Set size in pads and timebins\r
 \r
     clusterKr.SetTimeStamp(fTimeStamp);\r
+    clusterKr.SetRun(fRun);\r
 \r
     clusterCounter++;\r
     \r