X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCAltroEmulator.cxx;h=8b44b8f0d5da9b44996d14d68a4b3d74bf6715a2;hb=7fbe62cf657f095d678bc8a7d5d89a61283552c0;hp=57b733a6c4136484a8868412b53d0f3bbcb9594a;hpb=eb7e0771caf998d1e301ab40159478c539adb0e3;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCAltroEmulator.cxx b/TPC/AliTPCAltroEmulator.cxx
index 57b733a6c41..8b44b8f0d5d 100644
--- a/TPC/AliTPCAltroEmulator.cxx
+++ b/TPC/AliTPCAltroEmulator.cxx
@@ -39,11 +39,62 @@
  *	@param Channel an <tt> short* </tt> Pointer to a 1d short Array with the input Data
  */
 
-AliTPCAltroEmulator::AliTPCAltroEmulator(int timebins, short* Channel){
+
+ClassImp(AliTPCAltroEmulator)
+
+AliTPCAltroEmulator::AliTPCAltroEmulator(int timebins, short* Channel) : 
+  TNamed(),
+  ftimebins(timebins),
+//  fChannelIn(Channel),
+  fChannelShort(Channel), 
+  fADCkeep(0),     
+  fOnBSL1(0), 
+  fOnTCF(0),  
+  fOnBSL2(0), 
+  fOnClip(0), 
+  fOnZSU(0),  
+
+  fConfiguredAltro(0),   // ConfiguredAltro
+  fConfiguredBSL1(0),    // ConfiguredBSL1
+  fConfiguredTCF(0),     // ConfiguredTCF
+  fConfiguredBSL2(0),    // ConfiguredBSL2
+  fConfiguredZSU(0),     // ConfiguredZSU
+  fBSL1mode(0),          // BSL1mode
+  fBSL1ValuePeDestal(0), // BSL1ValuePeDestal
+  fBSL1PedestalMem(0),  // BSL1PedestalMem
+  fBSL1polarity(0),      // BSL1polarity
+
+  fTCFK1(0), // K1
+  fTCFK2(0), // K2
+  fTCFK3(0), // K3
+  fTCFL1(0), // L1
+  fTCFL2(0), // L2
+  fTCFL3(0), // L3
+
+  fTCFK1Int(0), // K1Int
+  fTCFK2Int(0), // K2Int
+  fTCFK3Int(0), // K3Int
+  fTCFL1Int(0), // L1Int
+  fTCFL2Int(0), // L2Int
+  fTCFL3Int(0), // L3Int
+
+  fBSL2HighThreshold(0), // BSL2HighThreshold
+  fBSL2LowThreshold(0),  // BSL2LowThreshold
+  fBSL2Offset(0),        // BSL2Offset
+  fBSL2Presamples(0),    // BSL2Presamples(0),
+  fBSL2Postsamples(0),   // BSL2Postsamples
+
+  fZSUThreshold(0),      // ZSUThreshold
+
+  fZSUMinSamplesaboveThreshold(0), // ZSUMinSamplesaboveThreshold
+  fZSUPresamples(0),     // ZSUPresamples
+  fZSUPostsamples(0)     // ZSUPostsamples
+
+{
   //
   // Constructor of Altro Class
   //
-
+  /*
   ftimebins = timebins;
   
   fChannelShort = Channel;
@@ -59,12 +110,63 @@ AliTPCAltroEmulator::AliTPCAltroEmulator(int timebins, short* Channel){
   fConfiguredTCF = 0;
   fConfiguredBSL2 = 0;
   fConfiguredZSU = 0;
+  */
 }
 
-AliTPCAltroEmulator::AliTPCAltroEmulator(const AliTPCAltroEmulator &altro){
+
+AliTPCAltroEmulator::AliTPCAltroEmulator(const AliTPCAltroEmulator &altro):
+  TNamed(),
+  ftimebins(altro.ftimebins),
+//  fChannelIn(Channel),
+  fChannelShort(altro.fChannelShort), 
+  fADCkeep(0),     
+  fOnBSL1(0), 
+  fOnTCF(0),  
+  fOnBSL2(0), 
+  fOnClip(0), 
+  fOnZSU(0),  
+
+  fConfiguredAltro(0),   // ConfiguredAltro
+  fConfiguredBSL1(0),    // ConfiguredBSL1
+  fConfiguredTCF(0),     // ConfiguredTCF
+  fConfiguredBSL2(0),    // ConfiguredBSL2
+  fConfiguredZSU(0),     // ConfiguredZSU
+  fBSL1mode(0),          // BSL1mode
+  fBSL1ValuePeDestal(0), // BSL1ValuePeDestal
+  fBSL1PedestalMem(0),  // BSL1PedestalMem
+  fBSL1polarity(0),      // BSL1polarity
+
+  fTCFK1(0), // K1
+  fTCFK2(0), // K2
+  fTCFK3(0), // K3
+  fTCFL1(0), // L1
+  fTCFL2(0), // L2
+  fTCFL3(0), // L3
+
+  fTCFK1Int(0), // K1Int
+  fTCFK2Int(0), // K2Int
+  fTCFK3Int(0), // K3Int
+  fTCFL1Int(0), // L1Int
+  fTCFL2Int(0), // L2Int
+  fTCFL3Int(0), // L3Int
+
+  fBSL2HighThreshold(0), // BSL2HighThreshold
+  fBSL2LowThreshold(0),  // BSL2LowThreshold
+  fBSL2Offset(0),        // BSL2Offset
+  fBSL2Presamples(0),    // BSL2Presamples(0),
+  fBSL2Postsamples(0),   // BSL2Postsamples
+
+  fZSUThreshold(0),      // ZSUThreshold
+
+  fZSUMinSamplesaboveThreshold(0), // ZSUMinSamplesaboveThreshold
+  fZSUPresamples(0),     // ZSUPresamples
+  fZSUPostsamples(0)     // ZSUPostsamples
+
+{
   //
   // copy constructor of Altro Class
   //
+
 }
 
 
@@ -120,6 +222,9 @@ void AliTPCAltroEmulator::ConfigAltro(int ONBaselineCorrection1, int ONTailcance
   fOnClip = InRange(ONClipping,0,1,"AliTPCAltroEmulator::ConfigAltro","ONClipping");
   fOnZSU = InRange(ONZerosuppression,0,1,"AliTPCAltroEmulator::ConfigAltro","ONZerosuppression");
   fConfiguredAltro = 1;
+  if (!fConfiguredAltro) { //dummy code to avoid warning
+    printf("%d\n",ONDataFormatting); // does not have to be checked
+  }
 }
 
 /**  @brief Configures the Base Line Correction 1 (BSL1) Module
@@ -820,7 +925,7 @@ int AliTPCAltroEmulator::InBand(int ADC,int bsl, int LowThreshold, int HighThres
     return 0;
 }
 
-int AliTPCAltroEmulator::InRange(int parameter,int Low,int High,char *Module,char *ParameterName){
+int AliTPCAltroEmulator::InRange(int parameter,int Low,int High,const char *Module,const char *ParameterName){
   //
   //
   //