warnings with gcc 4.3.2

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

diff --git a/ITS/AliITSresponseSDD.cxx b/ITS/AliITSresponseSDD.cxx
index 421e69c002ce31df966f9f6127b92ac8a3951782..914c9afb61c3bc1ba25e31d77164dc1e15368898 100644 (file)
--- a/ITS/AliITSresponseSDD.cxx
+++ b/ITS/AliITSresponseSDD.cxx
@@ -28,98 +28,17 @@
 
 #include "AliITSresponseSDD.h"
 
-const Int_t AliITSresponseSDD::fgkMaxAdcDefault = 1024;
-const Float_t AliITSresponseSDD::fgkDynamicRangeDefault = 132.;
-const Float_t AliITSresponseSDD::fgkfChargeLossDefault = 0;
-const Float_t AliITSresponseSDD::fgkDiffCoeffDefault = 3.23;
-const Float_t AliITSresponseSDD::fgkDiffCoeff1Default = 30.;
-const TString AliITSresponseSDD::fgkParam1Default = "same";
-const TString AliITSresponseSDD::fgkParam2Default = "same";
-const TString AliITSresponseSDD::fgkOptionDefault = "1D";
-const Float_t AliITSresponseSDD::fgkDriftSpeedDefault = 7.3;
-const Float_t AliITSresponseSDD::fgkTimeOffsetDefault = 55.07;
+const Float_t AliITSresponseSDD::fgkTimeOffsetDefault = 54.30;
 const Float_t AliITSresponseSDD::fgkADC2keVDefault = 5.243;
-const Float_t AliITSresponseSDD::fgkNsigmasDefault = 3.;
-const Int_t AliITSresponseSDD::fgkNcompsDefault = 121;
-
+const Float_t AliITSresponseSDD::fgkCarlosRXClockPeriod = 25.;
 ClassImp(AliITSresponseSDD)
 
 //_________________________________________________________________________
 AliITSresponseSDD::AliITSresponseSDD():
-AliITSresponse(),
-fJitterError(0.),
-fDynamicRange(0.),
-fChargeLoss(0.),
+TObject(),
 fTimeOffset(fgkTimeOffsetDefault),
-fADC2keV(fgkADC2keVDefault),
-fElectronics(0),
-fMaxAdc(fgkMaxAdcDefault),
-fNsigmas(fgkNsigmasDefault),
-fGaus(),
-fNcomps(fgkNcompsDefault),
-fBitComp(kFALSE),
-fOption(),
-fParam1(),
-fParam2() {
+fADC2keV(fgkADC2keVDefault){
   // default constructor
-  fGaus = 0;
-  SetDiffCoeff(fgkDiffCoeffDefault,fgkDiffCoeff1Default);
-  //  SetNLookUp(fgkNcompsDefault);
-
-  SetJitterError();
-  SetElectronics();
-  SetDynamicRange(fgkDynamicRangeDefault);
-  SetChargeLoss(fgkfChargeLossDefault);
-  SetParamOptions(fgkParam1Default.Data(),fgkParam2Default.Data());
-  SetZeroSupp(fgkOptionDefault);
-  SetDo10to8();
-  SetOutputOption();
-}
-
-
-//______________________________________________________________________
-AliITSresponseSDD::~AliITSresponseSDD() { 
-
-  if(fGaus) delete fGaus;
 }
 
 
-//______________________________________________________________________
-Int_t AliITSresponseSDD::Convert8to10(Int_t signal) const {
-  // Undo the lossive 10 to 8 bit compression.
-  // code from Davide C. and Albert W.
-
-  if(Do10to8()){  // kTRUE if the compression is active
-    if (signal < 0 || signal > 255) {
-      Warning("Convert8to10","out of range signal=%d",signal);
-      return 0;
-    } // end if signal <0 || signal >255
-
-    if (signal < 128) return signal;
-    if (signal < 192) {
-      if (TMath::Odd(signal)) return (128+((signal-128)<<1));
-      else  return (128+((signal-128)<<1)+1);
-    } // end if signal < 192
-    if (signal < 224) {
-      if (TMath::Odd(signal)) return (256+((signal-192)<<3)+3);
-      else  return (256+((signal-192)<<3)+4);
-    } // end if signal < 224
-    if (TMath::Odd(signal)) return (512+((signal-224)<<4)+7);
-    return (512+((signal-224)<<4)+8);
-  }
-  else {  
-    return signal;
-  }
-}
-
-//________________________________________________________________________
-void AliITSresponseSDD::SetNLookUp(Int_t p1){
-  // Set number of sigmas over which cluster disintegration is performed
-  fNcomps=p1;
-  if (fGaus) delete fGaus;
-  fGaus = new TArrayF(fNcomps+1);
-  for(Int_t i=0; i<=fNcomps; i++) {
-    Float_t x = -fNsigmas + (2.*i*fNsigmas)/(fNcomps-1);
-    (*fGaus)[i] = exp(-((x*x)/2));
-  }
-}