New defintitons

[u/mrichter/AliRoot.git] / HLT / PHOS / AliHLTPHOSCommonDefs.h

diff --git a/HLT/PHOS/AliHLTPHOSCommonDefs.h b/HLT/PHOS/AliHLTPHOSCommonDefs.h
index 6b93f16fe9203b3b2e1eafb4137210a46bb4b513..f5370947bbeca7b3d690d678d198c14ed9ccdba7 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSCommonDefs.h
+++ b/HLT/PHOS/AliHLTPHOSCommonDefs.h
@@ -2,20 +2,42 @@
 #define ALIPHOSCOMMONDEFS_H
 
 //Hardware constants
-#define N_RCUS             4      /**<Number of RCUs per Module*/
-#define N_BRANCHES         2      /**<Number of branches per RCU*/
-#define N_FEECS           14      /**<Number of Frontend cards per branch*/
-#define N_ALTROS           4      /**<Number of ALTROs per frontend card*/
-#define N_ALTROCHANNELS   16      /**<Number of readout channles per ALTRO*/
-#define ALTRO_MAX_SAMPLES 1008    /**<The maximum number of samples of the ALTRO*/
+#define N_MODULES          5                             /**<Number of modules of the PHOS detector*/
+#define N_RCUS             4                             /**<Number of RCUs per Module*/
+#define N_RCUS_PER_MODULE  4                             /**<Number of RCUs per Module*/
+#define N_RCUS_PER_TOTAL   N_MODULES*N_RCUS_PER_MODULE   /**<Total number of RCUs for PHOS*/
+#define N_BRANCHES         2                             /**<Number of branches per RCU*/
+#define N_FEECS           14                             /**<Number of Frontend cards per branch*/
+#define N_ALTROS           4                             /**<Number of ALTROs per frontend card*/
+#define N_ALTROCHANNELS   16                             /**<Number of readout channles per ALTRO*/
+#define ALTRO_MAX_SAMPLES 1008                           /**<The maximum number of samples of the ALTRO*/
 
 //Geometry constants
-#define N_MODULES          5      /**<Number of modules of the PHOS detector*/
-#define N_ROWS_MOD         64     /**<Number of rows per module*/       
-#define N_COLUMNS_MOD      56     /**<Number of columns per module*/ 
-#define N_ROWS_RCU         32     /**<Number of rows per module*/       
-#define N_COLUMNS_RCU      28     /**<Number of columns per module*/ 
-#define N_GAINS            2      /**<Number of gains per ALTRO channel*/
+//#define N_MODULES          5                           /**<Number of modules of the PHOS detector*/
+
+//#define N_ROWS_MOD         64                          /**<Number of rows per module*/       
+//#define N_COLUMNS_MOD      56                          /**<Number of columns per module*/ 
+
+#define N_ROWS_MOD         56                            /**<Number of rows per module*/       
+#define N_COLUMNS_MOD      64                            /**<Number of columns per module*/ 
+
+#define N_ROWS_RCU         28                            /**<Number of rows per module*/       
+#define N_COLUMNS_RCU      32   
+#define N_ZROWS_RCU        N_ROWS_RCU                                 /**<Number of rows per module*/       
+#define N_XCOLUMNS_RCU     N_COLUMNS_RCU 
+
+#define N_ZROWS_MOD        N_ROWS_MOD                            /**<Number of rows per module*/       
+#define N_XCOLUMNS_MOD     N_COLUMNS_MOD                            /**<Number of columns per module*/ 
+
+//#define N_ROWS_RCU         32                            /**<Number of rows per module*/       
+//#define N_COLUMNS_RCU      28                            /**<Number of columns per module*/ 
+
+
+
+//#define N_ZROWS_RCU        N_ROWS_RCU                                 /**<Number of rows per module*/       
+//#define N_XCOLUMNS_RCU     N_COLUMNS_RCU 
+
+#define N_GAINS            2                             /**<Number of gains per ALTRO channel*/
 
 #define N_DATATYPES        10