Add info for expected detector-type occupancy and default signal values.

diff --git a/EVE/Alieve/ITSDigitsInfo.cxx b/EVE/Alieve/ITSDigitsInfo.cxx
index b24dabea5b42ec8ab0a74a96849a797008c5618d..ac09707fe87ca0f40a858cddf89489dd1b33c7d8 100644 (file)
--- a/EVE/Alieve/ITSDigitsInfo.cxx
+++ b/EVE/Alieve/ITSDigitsInfo.cxx
@@ -8,7 +8,6 @@
 #include <Reve/TTreeTools.h>
 
 #include "ITSDigitsInfo.h"
 #include <Reve/TTreeTools.h>
 
 #include "ITSDigitsInfo.h"

-//#include <AliITSresponseSDD.h>

 #include <AliITSCalibrationSDD.h>
 #include <AliITSdigit.h>
 #include <AliITSdigitSPD.h>
 #include <AliITSCalibrationSDD.h>
 #include <AliITSdigit.h>
 #include <AliITSdigitSPD.h>


@@ -63,14 +62,27 @@ void ITSDigitsInfo::SetTree(TTree* tree)
   fTree = tree;
 
   SetITSSegmentation();
   fTree = tree;
 
   SetITSSegmentation();

-  
+

   // create tables for scaling
   // create tables for scaling

+  fSPDMinVal = 0;
+  fSDDMinVal = 5;
+  fSSDMinVal = 2;
+
+  fSPDMaxVal = 1;
+  fSDDMaxVal = 80;
+  fSSDMaxVal = 100;
+
+  fSPDMaxOcc  = 0.15;
+  fSDDMaxOcc  = 0.15;
+  fSSDMaxOcc  = 0.3;
+

   // lowest scale factor refers to unscaled ITS module
   fSPDScaleX[0] = 1;
   fSPDScaleZ[0] = 1;
   fSDDScaleX[0] = 1;
   fSDDScaleZ[0] = 1;
   fSSDScale [0] = 1;
   // lowest scale factor refers to unscaled ITS module
   fSPDScaleX[0] = 1;
   fSPDScaleZ[0] = 1;
   fSDDScaleX[0] = 1;
   fSDDScaleZ[0] = 1;
   fSSDScale [0] = 1;

+

   // spd lows resolution is in the level of 8x2 readout chips
   Int_t nx = 8; // fSegSPD->Npx()/8; // 32
   Int_t nz = 6; // fSegSPD->Npz()/2; // 128
   // spd lows resolution is in the level of 8x2 readout chips
   Int_t nx = 8; // fSegSPD->Npx()/8; // 32
   Int_t nz = 6; // fSegSPD->Npz()/2; // 128


@@ -84,7 +96,6 @@ void ITSDigitsInfo::SetTree(TTree* tree)
   fSPDScaleX[4] = Int_t(nx*4); 
   fSPDScaleZ[4] = Int_t(nz*4); 
 
   fSPDScaleX[4] = Int_t(nx*4); 
   fSPDScaleZ[4] = Int_t(nz*4); 
 

-

   fSDDScaleX[1] = 2;
   fSDDScaleZ[1] = 2;
   fSDDScaleX[2] = 8;
   fSDDScaleX[1] = 2;
   fSDDScaleZ[1] = 2;
   fSDDScaleX[2] = 8;


@@ -98,14 +109,6 @@ void ITSDigitsInfo::SetTree(TTree* tree)
   fSSDScale[2] = 9;
   fSSDScale[3] = 20;
   fSSDScale[4] = 30;
   fSSDScale[2] = 9;
   fSSDScale[3] = 20;
   fSSDScale[4] = 30;

-
-  
-  // lowest scale factor refers unscaled ITS module
-  fSPDScaleX[0] = 1;
-  fSPDScaleZ[0] = 1;
-  fSDDScaleX[0] = 1;
-  fSDDScaleZ[0] = 1;
-  fSSDScale [0] = 1;

 }
 
 /**************************************************************************/
 }
 
 /**************************************************************************/

diff --git a/EVE/Alieve/ITSDigitsInfo.h b/EVE/Alieve/ITSDigitsInfo.h
index 28b6b0432f7df4095f3febcd7ae0fb694e933f5f..4b556669004edd6ddfac7b6e91e0515a81909ac2 100644 (file)
--- a/EVE/Alieve/ITSDigitsInfo.h
+++ b/EVE/Alieve/ITSDigitsInfo.h
@@ -37,17 +37,30 @@ protected:
 
 public:
   TTree*                   fTree;
 
 public:
   TTree*                   fTree;

+

   AliITSgeom*              fGeom;
   AliITSgeom*              fGeom;

+

   AliITSsegmentationSPD*   fSegSPD;
   AliITSsegmentationSDD*   fSegSDD;
   AliITSsegmentationSSD*   fSegSSD;
 
   AliITSsegmentationSPD*   fSegSPD;
   AliITSsegmentationSDD*   fSegSDD;
   AliITSsegmentationSSD*   fSegSSD;
 

-  Int_t        fSPDScaleX[5];
-  Int_t        fSPDScaleZ[5];
-  Int_t        fSDDScaleX[5];
-  Int_t        fSDDScaleZ[5];
-  Int_t        fSSDScale [5];
-    
+  Int_t                    fSPDMinVal;
+  Int_t                    fSSDMinVal;
+  Int_t                    fSDDMinVal;
+  Int_t                    fSPDMaxVal;
+  Int_t                    fSSDMaxVal;
+  Int_t                    fSDDMaxVal;
+
+  Float_t                  fSPDMaxOcc;
+  Float_t                  fSDDMaxOcc;
+  Float_t                  fSSDMaxOcc;
+
+  Int_t                    fSPDScaleX[5];
+  Int_t                    fSPDScaleZ[5];
+  Int_t                    fSDDScaleX[5];
+  Int_t                    fSDDScaleZ[5];
+  Int_t                    fSSDScale [5];
+

   ITSDigitsInfo();
   virtual ~ITSDigitsInfo();
 
   ITSDigitsInfo();
   virtual ~ITSDigitsInfo();