New mapping in agreement with the new instructions from Paolo and Giacinto

[u/mrichter/AliRoot.git] / HMPID / AliHMPIDDigit.h

diff --git a/HMPID/AliHMPIDDigit.h b/HMPID/AliHMPIDDigit.h
index e14b1bc1c48d79f0bf4cdc85e1b69538e159fd03..3dc0b3ae55a44951874e7ecd015a27e8179835d5 100644 (file)
--- a/HMPID/AliHMPIDDigit.h
+++ b/HMPID/AliHMPIDDigit.h
@@ -137,11 +137,25 @@ void AliHMPIDDigit::Raw(UInt_t &w32,Int_t &ddl,Int_t &r,Int_t &d,Int_t &a)const
 //   Returns: none
   Int_t y2a[6]={5,3,1,0,2,4};
 
-                                    ddl=2*Ch()+Pc()%2;                     //DDL# 0..13
-  Int_t tmp=1+Pc()/2*8+PadPcY()/6;  r=(Pc()%2)? 25-tmp:tmp;              //row r=1..24
-                                    d=1+PadPcX()/8;                      //DILOGIC# 1..10
-                                    a=y2a[PadPcY()%6]+6*(PadPcX()%8);    //ADDRESS 0..47        
-      
+                                    ddl=2*Ch()+Pc()%2;                    //DDL# 0..13
+ // Int_t tmp=1+Pc()/2*8+PadPcY()/6;  r=(Pc()%2)? 25-tmp:tmp;               //row r=1..24
+    Int_t tmp=Pc()/2*8+PadPcY()/6;  r=(Pc()%2)? tmp:24-tmp;               //row r=1..24
+                                    d=1+PadPcX()/8;                       //DILOGIC# 1..10
+                                    a=y2a[PadPcY()%6]+6*(PadPcX()%8);     //ADDRESS 0..47        
+    
+   /*
+   Int_t a2y[6]={3,2,4,1,5,0};     //pady for a given padress (for single DILOGIC chip)
+                                  Int_t ch=ddl/2;
+  Int_t tmp=(24-row)/8;
+  Int_t pc=(ddl%2)?5-2*tmp:2*tmp;
+  Int_t px=(dil-1)*8+pad/6;
+
+  tmp=(ddl%2)?row-1:(24-row);
+  Int_t py=6*(tmp%8)+a2y[pad%6];
+
+   */                                 
+                                    
+                                      
   w32=0;   
   //Printf("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
   //