Rawstream classes and digitsManager of AliTRD now changed to use new AliTRDSignalInde...
authorcblume <cblume@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 5 Jan 2009 14:44:15 +0000 (14:44 +0000)
committercblume <cblume@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 5 Jan 2009 14:44:15 +0000 (14:44 +0000)
TRD/AliTRDSignalIndex.cxx
TRD/AliTRDclusterizer.cxx
TRD/AliTRDdigitsManager.cxx
TRD/AliTRDrawData.cxx
TRD/AliTRDrawOldStream.cxx
TRD/AliTRDrawStream.cxx
TRD/AliTRDrawStreamTB.cxx

index 2fd9980..c0499ab 100644 (file)
@@ -227,6 +227,7 @@ void AliTRDSignalIndex::ResetArrays()
 {
   memset(fBoolIndex,0x00,sizeof(Bool_t)*fMaxLimit);
   memset(fSortedIndex,0xFF,2*sizeof(Short_t)*fMaxLimit);
+  fSortedWasInit = kFALSE;
 }
 
 //_____________________________________________________________________________
@@ -314,6 +315,8 @@ void AliTRDSignalIndex::ClearAll()
   ResetCounters();
 
   fHasEntry = kFALSE;
+  fSortedWasInit = kFALSE;
+  fMaxLimit = 0;
 
 }
 
index 50d0bf2..85f2cbd 100644 (file)
@@ -1031,9 +1031,9 @@ void AliTRDclusterizer::CreateCluster(const Int_t row, const Int_t col, const In
   // Store the amplitudes of the pads in the cluster for later analysis
   // and check whether one of these pads is masked in the database
   Short_t signals[7] = { 0, 0, 0, 0, 0, 0, 0 };
-  for(Int_t i = 0; i++; i<3)
+  for(Int_t i = 0; i<3; i++)
     signals[i+2] = TMath::Nint(clusterSignal[i]);
-  for(Int_t i = 0; i++; i<2)
+  for(Int_t i = 0; i<2; i++)
     {
       if(col+i >= 3)
        signals[i] = TMath::Nint(fDigitsOut->GetData(row,col-3+i,time));
index e7c942c..f80989b 100644 (file)
@@ -745,7 +745,7 @@ Bool_t AliTRDdigitsManager::BuildIndexes(Int_t det)
                  Int_t isig = digits->GetDataB(ir,ic,it);
                  if (isig > 0) 
                    {
-                     indexes->AddIndexTBin(ir,ic,it);      
+                     indexes->AddIndexRC(ir,ic);           
                    }
                } // tbins
            } // cols
index 5fdbb74..caeaf9f 100644 (file)
@@ -1047,8 +1047,7 @@ AliTRDdigitsManager *AliTRDrawData::Raw2DigitsOLD(AliRawReader *rawReader)
                {
                  digits->SetData(input.GetRow(), input.GetCol(),input.GetTimeBin() + it, input.GetSignals()[it]);
 
-                 indexes->AddIndexTBin(input.GetRow(), input.GetCol(),
-                                       input.GetTimeBin() + it);
+                 indexes->AddIndexRC(input.GetRow(), input.GetCol());
                  track0->SetData(input.GetRow(), input.GetCol(), input.GetTimeBin() + it, 0);
                  track1->SetData(input.GetRow(), input.GetCol(), input.GetTimeBin() + it, 0);
                  track2->SetData(input.GetRow(), input.GetCol(), input.GetTimeBin() + it, 0);
index 3436146..2e277bf 100644 (file)
@@ -712,7 +712,7 @@ Int_t AliTRDrawOldStream::NextChamber(AliTRDdigitsManager *man, UInt_t** /*track
                          if (GetSignals()[it] > 0)
                            {
                              digits->SetData(fROW, fCOL, fTB + it, fSig[it]);
-                             indexes->AddIndexTBin(fROW, fCOL, fTB + it);
+                             indexes->AddIndexRC(fROW, fCOL);
                              if (man->UsesDictionaries())
                                {
                                  track0->SetData(fROW, fCOL, fTB + it, 0);
index 2d69335..9ab8f54 100644 (file)
@@ -864,7 +864,7 @@ AliTRDrawStream::NextChamber(AliTRDdigitsManager *digitsManager, UInt_t **trackl
         if(padStatus)\r
     digits->SetPadStatus(GetRow(), GetCol(), it, padStatus);\r
                 \r
-        indexes->AddIndexTBin(GetRow(), GetCol(), it);\r
+        indexes->AddIndexRC(GetRow(), GetCol());\r
               if (digitsManager->UsesDictionaries()) \r
                 {\r
             track0->SetData(GetRow(), GetCol(), it, 0);\r
index 2d5a3a2..fea6b05 100644 (file)
@@ -866,7 +866,7 @@ AliTRDrawStreamTB::NextChamber(AliTRDdigitsManager *digitsManager, UInt_t **trac
         if(padStatus)
          digits->SetPadStatus(GetRow(), GetCol(), it, padStatus);
        
-        indexes->AddIndexTBin(GetRow(), GetCol(), it);
+        indexes->AddIndexRC(GetRow(), GetCol());
               if (digitsManager->UsesDictionaries()) 
                 {
             track0->SetData(GetRow(), GetCol(), it, 0);