add AliT0TriggerParameters

[u/mrichter/AliRoot.git] / T0 / AliT0RawData.cxx

diff --git a/T0/AliT0RawData.cxx b/T0/AliT0RawData.cxx
index 875c565080171a3005868e9f6e1abbc4fb573efe..5198958443a7d6423e52acfedf2a9d20e4fe3882 100644 (file)
--- a/T0/AliT0RawData.cxx
+++ b/T0/AliT0RawData.cxx
@@ -82,7 +82,7 @@ uncertances
   memset(fBuffer,0,512*sizeof(UInt_t));
 
   //get event number 
-  AliRunLoader *runloader = AliRunLoader::GetRunLoader();
+  AliRunLoader *runloader = AliRunLoader::Instance();
   if (runloader) {
     fEventNumber = runloader->GetEventNumber();
   }
@@ -184,26 +184,37 @@ void AliT0RawData::GetDigits(AliT0digit *fDigits)
   Int_t timeC = fDigits->BestTimeA();
   
   
-  TArrayI  *allData = new TArrayI(110);
-  Int_t i=0;
-  allData->AddAt(0,0);
-  for (i=1; i<25; i++) {
-    allData->AddAt(fTimeLED->At(i-1),i);
-    allData->AddAt(fTimeCFD->At(i-1),i+24);
-    allData->AddAt(fADC0->At(i-1),i+56);
-    allData->AddAt(fADC1->At(i-1),i+80);
-
+  //  TArrayI  *allData = new TArrayI(110);
+  Int_t allData[110][1];
+  for (Int_t i=0; i<110; i++) allData[i][0] = 0;
+
+  allData[0][0]=0;
+  for (Int_t i=1; i<13; i++) {
+    allData[i][0]    = fTimeCFD->At(i-1);
+    allData[i+12][0] = fTimeLED->At(i-1);
+    allData[i+56][0] = fTimeCFD->At(i-1+12);
+    allData[i+68][0] = fTimeLED->At(i-1+12);
+  }
+  
+  for (Int_t iii=0; iii<12; iii++) {
+    allData[2*iii+25][0] = fADC1->At(iii);
+    allData[2*iii+26][0] = fADC0->At(iii);
   }
-  allData->AddAt(meantime,49);
-  allData->AddAt(timediff,50);
-  allData->AddAt(timeA,51);
-  allData->AddAt(timeC,52);
-  allData->AddAt(mult0,53);
-  allData->AddAt(mult1,54);
-  allData->AddAt(mult0,55);
-  allData->AddAt(mult1,56);
-
-    cout.setf( ios_base::hex, ios_base::basefield );
+  for (Int_t ii=12; ii<24; ii++) {
+    allData[2*ii+57][0] = fADC1->At(ii);
+    allData[2*ii+58][0] = fADC0->At(ii);
+  }
+  
+  allData[49][0] = meantime;
+  allData[50][0] = timediff;
+  allData[51][0] = timeA;
+  allData[52][0] = timeC;
+  allData[53][0] = mult0;
+  allData[54][0] = mult1;
+  allData[55][0] = mult0;
+  allData[56][0] = mult1;
+
+  //    cout.setf( ios_base::hex, ios_base::basefield );
   //space for DRM header
   fIndex += 6;
 
@@ -228,15 +239,15 @@ void AliT0RawData::GetDigits(AliT0digit *fDigits)
   AliT0LookUpKey * lookkey  = new AliT0LookUpKey();
   AliT0LookUpValue * lookvalue ;//= new AliT0LookUpValue(trm,tdc,chain,channel);
   for (Int_t det = 0; det < 105; det++) {
-    time = allData->At(det);
-    if (time >0) {
+    time = allData[det][0];
+    if (time >0 && time !=99999) {
       lookkey->SetKey(det);
       lookvalue = (AliT0LookUpValue*) fLookUp.GetValue((TObject*)lookkey);     
       if (lookvalue ) 
        {
          isData++;
          itrm= lookvalue->GetTRM();
-         if (det >56 &&inside ==0)  {
+         if (det >56 &&inside == 0)  {
            WriteChainDataTrailer(1); // 1st chain trailer
            fIndex++;
            WriteChainDataHeader(2, 1);
@@ -247,7 +258,7 @@ void AliT0RawData::GetDigits(AliT0digit *fDigits)
          iTDC = lookvalue->GetTDC();
          channel = lookvalue->GetChannel();
          FillTime(channel,  iTDC,  time);
-         AliDebug(1,Form("  itrm %i ,  chain %i , iTDC %i, channel %i",itrm,chain,iTDC,channel));
+         AliDebug(1,Form("look %i  itrm %i ,  chain %i , iTDC %i, channel %i time %i", det,itrm,chain,iTDC,channel, time));
        }
       else
        {
@@ -277,8 +288,6 @@ void AliT0RawData::GetDigits(AliT0digit *fDigits)
     
     WriteDRMDataHeader();
     
-    delete allData;
-    
 }
 
 //_____________________________________________________________________________