]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - HMPID/AliHMPIDv2.cxx
Updated to version 5.3.1
[u/mrichter/AliRoot.git] / HMPID / AliHMPIDv2.cxx
index 95799a1bc8d3576e593ab2ca78f793ab2ec32ca3..974e510b76561a707a542cc800d2bfcf86000951 100644 (file)
@@ -20,6 +20,7 @@
 #include "AliHMPIDDigit.h"    //Digits2Raw(), Raw2SDigits()
 #include "AliHMPIDRawStream.h"  //Digits2Raw(), Raw2SDigits()
 #include "AliRawReader.h"     //Raw2SDigits()
+#include "AliTrackReference.h"
 #include <TVirtualMC.h>       //StepManager() for gMC
 #include <TPDGCode.h>         //StepHistory() 
 #include <AliStack.h>         //StepManager(),Hits2SDigits()78.6
@@ -28,7 +29,6 @@
 #include <AliMC.h>            //StepManager()      
 #include <AliRun.h>           //CreateMaterials()    
 #include <AliMagF.h>          //CreateMaterials()
-#include <TGeoManager.h>      //CreateGeometry()
 #include <TF1.h>              //DefineOpticalProperties()
 #include <TF2.h>              //DefineOpticalProperties()
 #include <TLorentzVector.h>   //IsLostByFresnel() 
@@ -48,10 +48,29 @@ void AliHMPIDv2::AddAlignableVolumes()const
   Double_t trans[3]={0.5*131.24,0.5*126.16,0};                            //translation from LORS to TGeo RS (half size AllX, half size allY,0)
   pGm->SetTranslation(trans);
  
-  for(Int_t i=AliHMPIDParam::kMinCh;i<=AliHMPIDParam::kMaxCh;i++) {
-      TGeoPNEntry *pPn=gGeoManager->SetAlignableEntry(Form("/HMPID/Chamber%i",i),Form("ALIC_1/Hmp_%i",i)); 
-      if(pPn) pPn->SetMatrix(pGm); 
-    }
+  Double_t ph[7]={10.,10., 30.,30.,30. ,50.,50};
+
+  for(Int_t iCh=AliHMPIDParam::kMinCh;iCh<=AliHMPIDParam::kMaxCh;iCh++) {
+      gGeoManager->SetAlignableEntry(Form("/HMPID/Chamber%i",iCh),Form("ALIC_1/Hmp_%i",iCh));  //aligment without AliCluster3D
+      //Get Tracking To Local matrcies for alignment with AliCluster3D
+      TGeoPNEntry *eCh = gGeoManager->GetAlignableEntry(Form("/HMPID/Chamber%i",iCh));
+      if (eCh) {
+       const char *path = eCh->GetTitle();
+       if (!gGeoManager->cd(path)) {
+         AliFatal(Form("Volume path %s not valid!",path));
+       }
+      TGeoHMatrix *globMatrix = gGeoManager->GetCurrentMatrix();
+      //Double_t phi = 20.0 * ((iCh+1) / 3) + 10.0;
+      Double_t phi = ph[iCh];
+      TGeoHMatrix *t2l  = new TGeoHMatrix();
+      t2l->RotateZ(phi);
+      t2l->MultiplyLeft(&(globMatrix->Inverse()));
+      eCh->SetMatrix(t2l);
+    }//eCh
+    else {
+       AliError(Form("Alignable entry /HMPID/Chamber%i is not valid!",iCh));
+      }
+    }//iCh loop
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDv2::CreateMaterials()
@@ -68,40 +87,155 @@ void AliHMPIDv2::CreateMaterials()
   Float_t aC6F14[2]={ 12.01 , 18.99} , zC6F14[2]={ 6 , 9}   , wC6F14[2]={6 , 14} , dC6F14=1.68    ; Int_t nC6F14=-2;
   Float_t  aSiO2[2]={ 28.09 , 15.99} ,  zSiO2[2]={14 , 8}   ,  wSiO2[2]={1 ,  2} ,  dSiO2=2.64    ; Int_t  nSiO2=-2; 
   Float_t   aCH4[2]={ 12.01 ,  1.01} ,   zCH4[2]={ 6 , 1}   ,   wCH4[2]={1 ,  4} ,   dCH4=7.17e-4 ; Int_t   nCH4=-2; 
-  Float_t   aCsI[2]={132.90 ,126.90} ,   zCsI[2]={55 ,53}   ,   wCsI[2]={1 ,  1} ,   dCsI=0.1     ; Int_t   nCsI=-2; 
+// not necessary...PCB properties instead! Float_t   aCsI[2]={132.90 ,126.90} ,   zCsI[2]={55 ,53}   ,   wCsI[2]={1 ,  1} ,   dCsI=0.1     ; Int_t   nCsI=-2; 
   
-  Float_t     aRoha= 12.01 ,               zRoha=  6 ,                              dRoha=  0.10 ,   radRoha= 18.80 , absRoha=  86.3/dRoha; //special material- quasi quartz
-  Float_t       aCu= 63.55 ,                 zCu= 29 ,                                dCu=  8.96 ,     radCu=  1.43 ,   absCu= 134.9/dCu  ;
-  Float_t        aW=183.84 ,                  zW= 74 ,                                 dW= 19.30 ,      radW=  0.35 ,    absW= 185.0/dW   ;
-  Float_t       aAl= 26.98 ,                 zAl= 13 ,                                dAl=  2.70 ,     radAl=  8.90 ,   absAl= 106.4/dAl  ;
-  Float_t       aAr= 39.94 ,                 zAr= 18 ,                                dAr=  1.396e-3,  radAr=  14.0 ,   absAr= 117.2/dAr  ;   
-           
+  Float_t     aRoha = 12.01 ,   zRoha =  6 ,  dRoha =  0.10    ,   radRoha = 18.80 , absRoha =  86.3/dRoha; //special material- quasi quartz
+  Float_t       aCu = 63.55 ,   zCu   = 29 ,  dCu   =  8.96    ,   radCu   =  1.43 , absCu   = 134.9/dCu  ;
+  Float_t        aW =183.84 ,   zW    = 74 ,  dW    = 19.30    ,   radW    =  0.35 , absW    = 185.0/dW   ;
+  Float_t       aAl = 26.98 ,   zAl   = 13 ,  dAl   =  2.70    ,   radAl   =  8.90 , absAl   = 106.4/dAl  ;
+  Float_t       aAr = 39.94 ,   zAr   = 18 ,  dAr   =  1.396e-3,   radAr   =  14.0 , absAr   = 117.2/dAr  ;   
+
     Int_t   matId=0;                           //tmp material id number
     Int_t   unsens =  0, sens=1;               //sensitive or unsensitive medium
     Int_t   itgfld = gAlice->Field()->Integ(); //type of field intergration 0 no field -1 user in guswim 1 Runge Kutta 2 helix 3 const field along z
     Float_t maxfld = gAlice->Field()->Max();   //max field value
     Float_t tmaxfd = -10.0;                    //max deflection angle due to magnetic field in one step
     Float_t deemax = - 0.2;                    //max fractional energy loss in one step   
-    Float_t stemax = - 0.1;                    //mas step allowed [cm]
+    Float_t stemax = - 0.1;                    //max step allowed [cm]
     Float_t epsil  =   0.001;                  //abs tracking precision [cm]   
     Float_t stmin  = - 0.001;                  //min step size [cm] in continius process transport, negative value: choose it automatically
+
+    // PCB copmposed mainly by G10 (Si,C,H,O) -> CsI is negligible (<500nm thick)
+    // So what is called CsI has the optical properties of CsI, but the composition of G-10 (for delta elec, etc production...)
+    
+    Float_t aG10[4] = {28.09,12.01,1.01,16.00};
+    Float_t zG10[4] = {14.,  6.,  1.,  8.};
+    Float_t wG10[4] = {0.129060,0.515016,0.061873,0.294050};
+    Float_t dG10    = 1.7;
+    Int_t   nG10    = 4;
     
     AliMixture(++matId,"Air"  ,aAir  ,zAir  ,dAir  ,nAir  ,wAir  ); AliMedium(kAir  ,"Air"  ,matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);
     AliMixture(++matId,"C6F14",aC6F14,zC6F14,dC6F14,nC6F14,wC6F14); AliMedium(kC6F14,"C6F14",matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);      
     AliMixture(++matId,"SiO2" ,aSiO2 ,zSiO2 ,dSiO2 ,nSiO2 ,wSiO2 ); AliMedium(kSiO2 ,"SiO2" ,matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);    
     AliMixture(++matId,"CH4"  ,aCH4  ,zCH4  ,dCH4  ,nCH4  ,wCH4  ); AliMedium(kCH4  ,"CH4"  ,matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);  
-    AliMixture(++matId,"CsI"  ,aCsI  ,zCsI  ,dCsI  ,nCsI  ,wCsI  ); AliMedium(kCsI  ,"CsI"  ,matId,   sens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);//sensitive
-  
-    AliMixture(++matId ,"Neo" ,aSiO2 ,zSiO2 ,dSiO2 ,nSiO2 ,wSiO2 ); AliMedium(kNeo,"Neo" , matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin); //clm neoceram
-    AliMaterial(++matId,"Roha",aRoha,zRoha,dRoha,radRoha,absRoha);  AliMedium(kRoha,"Roha", matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin); //Roha->honeycomb
+//    AliMixture(++matId,"CsI"  ,aCsI  ,zCsI  ,dCsI  ,nCsI  ,wCsI  ); AliMedium(kCsI  ,"CsI"  ,matId,   sens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);//sensitive
+    AliMixture(++matId,"CsI+PCB",aG10  , zG10, dG10,nG10   ,wG10   ); AliMedium(kCsI  ,"CsI"  ,matId,   sens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);//sensitive
+
+    AliMixture(++matId ,"Neo" ,aSiO2 ,zSiO2 ,dSiO2 ,nSiO2 ,wSiO2 ); AliMedium(kNeo  ,"Neo"  ,matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin); //clm neoceram
+    AliMaterial(++matId,"Roha",aRoha,zRoha,dRoha,radRoha,absRoha);  AliMedium(kRoha ,"Roha" ,matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin); //Roha->honeycomb
+
 
-    
     AliMaterial(++matId,"Cu"  ,aCu  ,zCu  ,dCu  ,radCu  ,absCu  );  AliMedium(kCu  ,"Cu"  , matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);
     AliMaterial(++matId,"W"   ,aW   ,zW   ,dW   ,radW   ,absW   );  AliMedium(kW   ,"W"   , matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);
     AliMaterial(++matId,"Al"  ,aAl  ,zAl  ,dAl  ,radAl  ,absAl  );  AliMedium(kAl  ,"Al"  , matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);
     AliMaterial(++matId,"Ar"  ,aAr  ,zAr  ,dAr  ,radAr  ,absAr  );  AliMedium(kAr  ,"Ar"  , matId, unsens, itgfld, maxfld, tmaxfd, stemax, deemax, epsil, stmin);
+
+    InitProperties();
+        
 }//void AliHMPID::CreateMaterials()
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void AliHMPIDv2::InitProperties()
+{
+/*
+* HMPID
+* ====
+*
+*       GAM   ELEC  NHAD   CHAD  MUON  EBREM MUHAB  EDEL  MUDEL MUPA ANNI BREM COMP DCAY DRAY HADR LOSS MULS PAIR PHOT RAYL
+* Quarz Window        (>1000 keV delta-electrons)
+HMPID  3  1.e-4 1.e-4 1.e-4  -1.   1.e-4 -1.   -1.    1.e-3 1.e-3 -1.  -1   -1   -1   -1   1    -1   1    -1   -1   -1   -1 
+* Freon Radiator      (>  500 keV delta-electrons)
+HMPID  4  1.e-4 1.e-4 1.e-4  -1.   1.e-4 -1.   -1.    5.e-4 5.e-4 -1.  -1   -1   -1   -1   1    -1   1    -1   -1   -1   -1 
+* Methane Gap         (>  100 keV delta-electrons)
+HMPID  5  5.e-5 1.e-5 1.e-4 -1.   1.e-4 -1.   -1.     1.e-4 1.e-4 -1.  -1   -1   -1   -1   1    -1   1    -1   -1   -1   -1 
+* Sensitive Volume    (>  50 keV delta-electrons)
+HMPID  9  1.e-5 1.e-5 1.e-4  -1.   1.e-4 -1.   -1.    5.e-5 5.e-5 -1.  -1   -1   -1   -1   1    -1   1    -1   -1   -1   -1 
+* CSI    (>  50 keV delta-electrons)
+HMPID  6  1.e-5 1.e-5 1.e-4  -1.   1.e-4 -1.   -1.    5.e-5 5.e-5 -1.  -1   -1   -1   -1   1    -1   1    -1   -1   -1   -1 
+* PCB backplane   (>  50 keV delta-electrons)
+HMPID 12  1.e-5 1.e-5 1.e-4  -1.   1.e-4 -1.   -1.    5.e-5 5.e-5 -1.  -1   -1   -1   -1   1    -1   1    -1   -1   -1   -1 
+*/
+    Int_t *idtmed = fIdtmed->GetArray();
+    Int_t imed;
+    
+    imed = kSiO2;   // * Quarz Window        (>1000 keV delta-electrons)
+    gMC->Gstpar(idtmed[imed], "CUTGAM",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTELE",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTNEU",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTMUO",1.e-4);    
+    gMC->Gstpar(idtmed[imed], "DCUTE" ,1.e-3);    
+    gMC->Gstpar(idtmed[imed], "CUTHAD",1.e-3);    
+    
+    gMC->Gstpar(idtmed[imed], "DRAY",1);    
+    gMC->Gstpar(idtmed[imed], "LOSS",1);    
+
+    imed = kC6F14;  // * Freon Radiator      (>  500 keV delta-electrons)
+    gMC->Gstpar(idtmed[imed], "CUTGAM",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTELE",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTNEU",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTMUO",1.e-4);    
+    gMC->Gstpar(idtmed[imed], "DCUTE" ,5.e-4);    
+    gMC->Gstpar(idtmed[imed], "CUTHAD",5.e-4);    
+    
+    gMC->Gstpar(idtmed[imed], "DRAY",1);    
+    gMC->Gstpar(idtmed[imed], "LOSS",1);    
+    
+    imed = kCH4;  // * Methane Gap         (>  100 keV delta-electrons)
+    gMC->Gstpar(idtmed[imed], "CUTGAM",5.e-5);
+    gMC->Gstpar(idtmed[imed], "CUTELE",5.e-5);
+    gMC->Gstpar(idtmed[imed], "CUTNEU",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTMUO",1.e-4);    
+    gMC->Gstpar(idtmed[imed], "DCUTE" ,1.e-4);    
+    gMC->Gstpar(idtmed[imed], "CUTHAD",1.e-4);    
+    
+    gMC->Gstpar(idtmed[imed], "DRAY",1);    
+    gMC->Gstpar(idtmed[imed], "LOSS",1);    
+    
+    imed = kCsI;  // * CSI    (>  50 keV delta-electrons)
+    gMC->Gstpar(idtmed[imed], "CUTGAM",1.e-5);
+    gMC->Gstpar(idtmed[imed], "CUTELE",1.e-5);
+    gMC->Gstpar(idtmed[imed], "CUTNEU",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTMUO",1.e-4);    
+    gMC->Gstpar(idtmed[imed], "DCUTE" ,5.e-5);    
+    gMC->Gstpar(idtmed[imed], "CUTHAD",5.e-5);    
+    
+    gMC->Gstpar(idtmed[imed], "DRAY",1);    
+    gMC->Gstpar(idtmed[imed], "LOSS",1);
+    
+    imed = kAl;  // * Alluminium    (>  50 keV delta-electrons)
+    gMC->Gstpar(idtmed[imed], "CUTGAM",1.e-5);
+    gMC->Gstpar(idtmed[imed], "CUTELE",1.e-5);
+    gMC->Gstpar(idtmed[imed], "CUTNEU",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTMUO",1.e-4);    
+    gMC->Gstpar(idtmed[imed], "DCUTE" ,5.e-5);    
+    gMC->Gstpar(idtmed[imed], "CUTHAD",5.e-5);    
+    
+    gMC->Gstpar(idtmed[imed], "DRAY",1);    
+    gMC->Gstpar(idtmed[imed], "LOSS",1);    
+    
+    imed = kCu;  // * Copper       (>  50 keV delta-electrons)
+    gMC->Gstpar(idtmed[imed], "CUTGAM",1.e-5);
+    gMC->Gstpar(idtmed[imed], "CUTELE",1.e-5);
+    gMC->Gstpar(idtmed[imed], "CUTNEU",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTMUO",1.e-4);    
+    gMC->Gstpar(idtmed[imed], "DCUTE" ,5.e-5);    
+    gMC->Gstpar(idtmed[imed], "CUTHAD",5.e-5);    
+    
+    gMC->Gstpar(idtmed[imed], "DRAY",1);    
+    gMC->Gstpar(idtmed[imed], "LOSS",1);    
+    
+    imed = kW;  // * Tungsten     (>  50 keV delta-electrons)
+    gMC->Gstpar(idtmed[imed], "CUTGAM",1.e-5);
+    gMC->Gstpar(idtmed[imed], "CUTELE",1.e-5);
+    gMC->Gstpar(idtmed[imed], "CUTNEU",1.e-4);
+    gMC->Gstpar(idtmed[imed], "CUTMUO",1.e-4);    
+    gMC->Gstpar(idtmed[imed], "DCUTE" ,5.e-5);    
+    gMC->Gstpar(idtmed[imed], "CUTHAD",5.e-5);    
+    
+    gMC->Gstpar(idtmed[imed], "DRAY",1);    
+    gMC->Gstpar(idtmed[imed], "LOSS",1);    
+    
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDv2::CreateGeometry()
 {
 //Creates detailed geometry simulation (currently GEANT volumes tree)         
@@ -156,7 +290,7 @@ void AliHMPIDv2::CreateGeometry()
   TGeoVolume *cel=        row->Divide  ("Hcel",1,nPadX,0,0);//along X->80 cells
   TGeoVolume *cat=gGeoManager->MakeTube("Hcat",cu   ,    0.00*mm   ,   50.00*um   ,    cellx/2); 
   TGeoVolume *ano=gGeoManager->MakeTube("Hano",w    ,    0.00*mm   ,   20.00*um   ,    cellx/2); 
-  TGeoVolume *pad=gGeoManager->MakeBox ("Hpad",csi  ,    7.54*mm/2 ,    7.90*mm/2 ,    1.7*mm/2); //2006P1     
+  TGeoVolume *pad=gGeoManager->MakeBox ("Hpad",csi  ,    7.54*mm/2 ,    7.90*mm/2 ,    1.7*mm/2); //2006P1 PCB material...     
   TGeoVolume *fr1=gGeoManager->MakeBox ("Hfr1",al   , 1463*mm/2 , 1422.00*mm/2 ,   58.3*mm/2);//2040P1
   TGeoVolume *fr1up=gGeoManager->MakeBox ("Hfr1up",ch4,(1426.00-37.00)*mm/2 , (1385.00-37.00)*mm/2 ,    20.0*mm/2);//2040P1
   TGeoVolume *fr1perUpBig=gGeoManager->MakeBox ("Hfr1perUpBig",ch4,1389*mm/2,35*mm/2,10*mm/2);    
@@ -300,7 +434,8 @@ hmp->AddNode(fr3,1,new TGeoTranslation(0.,0.,(80.-29.)*mm-34.*mm/2));
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDv2::Init()
 {
-// This methode defines ID for sensitive volumes, i.e. such geometry volumes for which there are if(gMC->CurrentVolID()==XXX) statements in StepManager()
+// This method defines ID for sensitive volumes, i.e. such geometry volumes for which there are if(gMC->CurrentVolID()==XXX) 
+// statements in StepManager()
 // Arguments: none
 //   Returns: none      
   AliDebug(1,"Start v2 HMPID.");    
@@ -321,7 +456,7 @@ void AliHMPIDv2::DefineOpticalProperties()
   Float_t                                                    aQeAll [kNbins], aQePc [kNbins];
   Double_t dReflMet[kNbins], dQePc[kNbins];
 
-  TF2 *pRaIF=new TF2("HidxRad","sqrt(1+0.554*(1239.84/x)^2/((1239.84/x)^2-5796)-0.0005*(y-20))"                                       ,emin,emax,0,50); //DiMauro mail temp 0-50 degrees C
+  TF2 *pRaIF=new TF2("HidxRad","sqrt(1+0.554*(1239.84/x)^2/((1239.84/x)^2-5769)-0.0005*(y-20))"                                       ,emin,emax,0,50); //DiMauro mail temp 0-50 degrees C
   TF1 *pWiIF=new TF1("HidxWin","sqrt(1+46.411/(10.666*10.666-x*x)+228.71/(18.125*18.125-x*x))"                                        ,emin,emax);      //SiO2 idx TDR p.35
   TF1 *pGaIF=new TF1("HidxGap","1+0.12489e-6/(2.62e-4 - x*x/1239.84/1239.84)"                                                         ,emin,emax);      //?????? from where  
 
@@ -583,25 +718,19 @@ Bool_t AliHMPIDv2::Raw2SDigits(AliRawReader *pRR)
 // Interface methode ivoked from AliSimulation to create a list of sdigits from raw digits. Events loop is done in AliSimulation
 // Arguments: pRR- raw reader 
 //   Returns: kTRUE on success (currently ignored in AliSimulation::ConvertRaw2SDigits())      
-  AliHMPIDDigit sdi; //tmp sdigit, raw digit will be converted to it
+  //AliHMPIDDigit sdi; //tmp sdigit, raw digit will be converted to it
+  
   if(!GetLoader()->TreeS()) {MakeTree("S");  MakeBranch("S");}
     
   TClonesArray *pSdiLst=SdiLst(); Int_t iSdiCnt=0; //tmp list of sdigits for all chambers
   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
   SdiReset();
@@ -699,7 +828,9 @@ void AliHMPIDv2::StepManager()
   
 //Treat charged particles  
   static Float_t eloss;                                                                           //need to store mip parameters between different steps    
-  static Double_t in[3];
+  static Double_t in[3];                                                                          
+  if(gMC->IsTrackEntering() && gMC->TrackCharge() && gMC->CurrentVolID(copy)==fIdPad)             //Trackref stored when entering in the pad volume
+    AddTrackReference(gMC->GetStack()->GetCurrentTrackNumber(), AliTrackReference::kHMPID);       //for acceptance calculations
   if(gMC->TrackCharge() && gMC->CurrentVolID(copy)==fIdCell){                                     //charged particle in amplification gap (fIdCell)
     if(gMC->IsTrackEntering()||gMC->IsNewTrack()) {                                               //entering or newly created
       eloss=0;                                                                                    //reset Eloss collector