Modification for new development in raw data

[u/mrichter/AliRoot.git] / HMPID / AliHMPIDv1.cxx

diff --git a/HMPID/AliHMPIDv1.cxx b/HMPID/AliHMPIDv1.cxx
index 9fffa9263b67b931a33a5f79a3c241866f7844e7..7e6823d945743f35e1eaa149e0ee7116fb9571e3 100644 (file)
--- a/HMPID/AliHMPIDv1.cxx
+++ b/HMPID/AliHMPIDv1.cxx
@@ -474,16 +474,10 @@ Bool_t AliHMPIDv1::Raw2SDigits(AliRawReader *pRR)
   AliHMPIDRawStream stream(pRR);
   while(stream.Next())
   {
-    UInt_t ddl=stream.GetDDLNumber(); //returns 0,1,2 ... 13  
-    for(Int_t row = 1; row <=AliHMPIDRawStream::kNRows; row++){
-     for(Int_t dil = 1; dil <= AliHMPIDRawStream::kNDILOGICAdd; dil++){
-      for(Int_t pad = 0; pad < AliHMPIDRawStream::kNPadAdd; pad++){
-          if(stream.GetCharge(ddl,row,dil,pad)<1) continue;
-          AliHMPIDDigit sdi(stream.GetPad(ddl,row,dil,pad),stream.GetCharge(ddl,row,dil,pad));
-          new((*pSdiLst)[iSdiCnt++]) AliHMPIDDigit(sdi); //add this digit to the tmp list
-          }//pad
-      }//dil
-    }//row
+    for(Int_t iPad=0;iPad<stream.GetNPads();iPad++) {
+      AliHMPIDDigit sdi(stream.GetPadArray()[iPad],stream.GetChargeArray()[iPad]);
+      new((*pSdiLst)[iSdiCnt++]) AliHMPIDDigit(sdi); //add this digit to the tmp list
+    }
   }
   
   GetLoader()->TreeS()->Fill(); GetLoader()->WriteSDigits("OVERWRITE");//write out sdigits