Reintroduce bug fix 26008

[u/mrichter/AliRoot.git] / ITS / AliITSresponseSDD.h

diff --git a/ITS/AliITSresponseSDD.h b/ITS/AliITSresponseSDD.h
index 27ca611994a3faaf6a9bf690a52c93641707a830..ae69204fdd001769c4e5aaaa44537a299067b2d9 100644 (file)
--- a/ITS/AliITSresponseSDD.h
+++ b/ITS/AliITSresponseSDD.h
@@ -40,8 +40,6 @@ class AliITSresponseSDD : public AliITSresponse {
     virtual Float_t DynamicRange() const {// Get Dynamic Range
        return fDynamicRange;}
 
-    virtual void    SetDriftSpeed(Double_t p1) {fDriftSpeed=p1;}    
-    virtual Float_t DriftSpeed() const {return fDriftSpeed;}
     static Float_t DefaultDriftSpeed() {return fgkDriftSpeedDefault;}
 
     virtual void SetTimeOffset(Float_t to){fTimeOffset = to;}
@@ -58,10 +56,8 @@ class AliITSresponseSDD : public AliITSresponse {
     virtual void   ParamOptions(char *opt1,char *opt2) const {// options
        strcpy(opt1,fParam1.Data()); strcpy(opt2,fParam2.Data());}
  
-    virtual Bool_t Do10to8() const {// get 10 to 8 compression option
-       return fBitComp;}
     void    SetZeroSupp (const char *opt) {
-       // Zero-suppression option - could be 1D, 2D or non-ZS 
+       // Zero-suppression option - could be ZS or NOTSUPP
        fOption=opt;}
     const char *ZeroSuppOption() const {// Get zero-suppression option
        return fOption.Data();}
@@ -80,16 +76,11 @@ class AliITSresponseSDD : public AliITSresponse {
       if(i<0 || i>=fNcomps) return 0.;return fGaus->At(i);
     }
    
-    Int_t Convert8to10(Int_t signal) const; //undo 10 to 8 bit SDD compresion
-
     void  SetJitterError(Float_t jitter=20) {
        // set Jitter error (20 um for ALICE from beam test measurements 2001)
        fJitterError=jitter;}
     Float_t  JitterError() const {// set Jitter error
        return fJitterError;}
-    void  SetDo10to8(Bool_t bitcomp=kTRUE) {
-       // set the option for 10 to 8 bit compression
-       fBitComp = bitcomp;}
 
  protected:
 
@@ -101,7 +92,7 @@ class AliITSresponseSDD : public AliITSresponse {
     static const TString fgkParam1Default; // default for fParam1
     static const TString fgkParam2Default; // default for fParam2
     static const TString fgkOptionDefault; // default for fOption
-    static const Float_t fgkDriftSpeedDefault; // default for fDriftSpeed
+    static const Float_t fgkDriftSpeedDefault; // default for drift speed
     static const Float_t fgkTimeOffsetDefault; // default for fTimeOffset
     static const Float_t fgkADC2keVDefault; // default for fADC2keV
     static const Float_t fgkNsigmasDefault; //default for fNsigmas
@@ -111,7 +102,6 @@ class AliITSresponseSDD : public AliITSresponse {
     Float_t  fJitterError;    // jitter error
     Float_t  fDynamicRange;   // Set Dynamic Range 
     Float_t  fChargeLoss;     // Set Linear Coefficient for Charge Loss 
-    Float_t  fDriftSpeed;     // Drift velocity
     Float_t  fTimeOffset;     // Time offset due to electronic delays 
     Float_t  fADC2keV;        // Conversion factor from ADC to keV
     Int_t    fElectronics;    // Electronics
@@ -120,8 +110,7 @@ class AliITSresponseSDD : public AliITSresponse {
                           // is performed
     TArrayF   *fGaus;          // Gaussian lookup table for signal generation
     Int_t      fNcomps;        // Number of samplings along the gaussian
-    Bool_t     fBitComp;       // 10 to 8 bit compression option
-    TString    fOption;        // Zero-suppresion option (1D, 2D or none)
+    TString    fOption;        // Zero-suppresion option (ZS or non-ZS)
     TString    fParam1;        // Read baselines from file option
     TString    fParam2;        // Read compression algo thresholds from file
 
@@ -130,7 +119,7 @@ class AliITSresponseSDD : public AliITSresponse {
    AliITSresponseSDD(const AliITSresponseSDD &ob); // copy constructor
    AliITSresponseSDD& operator=(const AliITSresponseSDD & /* source */); // ass. op.
 
-    ClassDef(AliITSresponseSDD,9) // Base response class 
+    ClassDef(AliITSresponseSDD,11) // Base response class 
     
     };
 #endif