Re-definition of IntPH() to accomodate for wire sag effect.

Setters for wire sag effect and voltage values.

diff --git a/RICH/AliRICHChamber.h b/RICH/AliRICHChamber.h
index 78ae0faf8686922e746ad0f9b50ff1637464132f..1fa7f0e153892c7cf102fe6014306eead0345630 100644 (file)
--- a/RICH/AliRICHChamber.h
+++ b/RICH/AliRICHChamber.h
@@ -115,8 +115,8 @@ class AliRICHChamber : public TObject
 // Member function forwarding to the segmentation and response models
 //
 // Calculate pulse height from energy loss  
-    Float_t IntPH(Float_t eloss) {return fResponse->IntPH(eloss);}
-    Float_t IntPH()              {return fResponse->IntPH();}
+    Float_t IntPH(Float_t eloss, Float_t yhit) {return fResponse->IntPH(eloss,yhit);}
+    Float_t IntPH(Float_t yhit)              {return fResponse->IntPH(yhit);}
 //  
 // Ask segmentation if signal should be generated  
     Int_t   SigGenCond(Float_t x, Float_t y, Float_t z)
@@ -183,6 +183,16 @@ class AliRICHChamber : public TObject
        {
            fResponse->SetPitch(p);
        }
+
+    void   SetWireSag(Int_t p)
+       {
+           fResponse->SetWireSag(p);
+       }
+
+    void   SetVoltage(Int_t p)
+       {
+           fResponse->SetVoltage(p);
+       }
     
     void   SetPadSize(Float_t p1, Float_t p2)
        {

diff --git a/RICH/AliRICHResponse.h b/RICH/AliRICHResponse.h
index edde532cac056dad718c14b2e44002e414b2d210..93df0bacbd22d5964e195fe617d8bfd6ebfea4b7 100644 (file)
--- a/RICH/AliRICHResponse.h
+++ b/RICH/AliRICHResponse.h
@@ -44,8 +44,8 @@ public TObject {
     virtual Float_t EIonisation()                             =0;
     // Chamber response methods
     // Pulse height from scored quantity (eloss)
-    virtual Float_t IntPH(Float_t eloss)                       =0;
-    virtual Float_t IntPH()                                    =0;
+    virtual Float_t IntPH(Float_t eloss,Float_t yhit)          =0;
+    virtual Float_t IntPH(Float_t yhit)                        =0;
     // Charge disintegration
     virtual Float_t IntXY(AliSegmentation *)                   =0;
     virtual Int_t   FeedBackPhotons(Float_t *source, Float_t qtot) =0;
@@ -57,6 +57,9 @@ public TObject {
     virtual void   SetSqrtKy3(Float_t p1)                        =0;
     virtual void   SetKy2(Float_t p1)                            =0;
     virtual void   SetKy4(Float_t p1)                            =0;
+    // Wire sag
+    virtual void SetWireSag(Int_t p1)                            =0;
+    virtual void SetVoltage(Int_t p1)                          =0;
     ClassDef(AliRICHResponse,1)
 };
 

diff --git a/RICH/AliRICHResponseV0.h b/RICH/AliRICHResponseV0.h
index bdbb94ca1ec2407f2588d7435f01c7a4145b348f..036dab3446526c1ca6ee7fc9003bb4bec2c4d482 100644 (file)
--- a/RICH/AliRICHResponseV0.h
+++ b/RICH/AliRICHResponseV0.h
@@ -53,11 +53,14 @@ public AliRICHResponse {
     //  
     // Chamber response methods
     // Pulse height from scored quantity (eloss)
-    virtual Float_t IntPH(Float_t eloss);
-    virtual Float_t IntPH();
+    virtual Float_t IntPH(Float_t eloss, Float_t yhit);
+    virtual Float_t IntPH(Float_t yhit);
     // Charge disintegration
     virtual Float_t IntXY(AliSegmentation * segmentation);
     virtual Int_t   FeedBackPhotons(Float_t *source, Float_t qtot);
+    // Wire sag
+    virtual void SetWireSag(Int_t p1) {fWireSag=p1;};
+    virtual void SetVoltage(Int_t p1) {fVoltage=p1;};
        protected:
     Float_t fChargeSlope;              // Slope of the charge distribution
     Float_t fChargeSpreadX;            // Width of the charge distribution in x
@@ -66,13 +69,15 @@ public AliRICHResponse {
     Float_t fAlphaFeedback;            // Feedback photons coefficient
     Float_t fEIonisation;              // Mean ionisation energy
     Float_t fMaxAdc;                   // Maximum ADC channel
-    Float_t fSqrtKx3;         // Mathieson parameters for x
-    Float_t fKx2;             // Mathieson parameters for x
-    Float_t fKx4;             // Mathieson parameters for x
-    Float_t fSqrtKy3;         // Mathieson parameters for y
-    Float_t fKy2;             // Mathieson parameters for y 
-    Float_t fKy4;             // Mathieson parameters for y
-    Float_t fPitch;           //anode-cathode pitch
+    Float_t fSqrtKx3;                  // Mathieson parameters for x
+    Float_t fKx2;                      // Mathieson parameters for x
+    Float_t fKx4;                      // Mathieson parameters for x
+    Float_t fSqrtKy3;                  // Mathieson parameters for y
+    Float_t fKy2;                      // Mathieson parameters for y 
+    Float_t fKy4;                      // Mathieson parameters for y
+    Float_t fPitch;                    // Anode-cathode pitch
+    Int_t   fWireSag;                  // Flag to turn on/off (0/1) wire sag
+    Int_t fVoltage;                  // Working voltage (2000, 2050, 2100, 2150)
     ClassDef(AliRICHResponseV0,1)
 };
 #endif