Run initialization fixed

[u/mrichter/AliRoot.git] / EMCAL / AliCaloFitResults.cxx

diff --git a/EMCAL/AliCaloFitResults.cxx b/EMCAL/AliCaloFitResults.cxx
index 9c3c4d0fe205acb2d18572b30b07fa694dddecd4..d0c7b6f8b89edacf6092deb1a563f054c72c3a8a 100644 (file)
--- a/EMCAL/AliCaloFitResults.cxx
+++ b/EMCAL/AliCaloFitResults.cxx
@@ -1,3 +1,4 @@
+// -*- mode: c++ -*-
 /**************************************************************************
  * This file is property of and copyright by                              *
  * the Relativistic Heavy Ion Group (RHIG), Yale University, US, 2009     *
@@ -16,18 +17,19 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-
 #include "AliCaloFitResults.h"
+#include "AliCaloConstants.h"
+
 
-AliCaloFitResults::AliCaloFitResults() : fMaxSig(-1),
+AliCaloFitResults::AliCaloFitResults() : fMaxSig(0),
                                         fPed(-1), 
                                         fStatus(-1),
                                         fAmpSig(-1),
                                         fTime(-1),
                                         fMaxTimebin(-1),
                                         fChi2Sig(-1),
-                                        fNdfSig(-1),
-                                        fMinSig(-1),
+                                        fNdfSig(0),
+                                        fMinSig(0),
                                         fFitSubarray(10) 
 {
   
@@ -44,11 +46,17 @@ AliCaloFitResults::AliCaloFitResults() : fMaxSig(-1),
 // The signal was fitted sucessfully. fStatus might have a different meaning If other 
 // procedures than  A different meaning Fitting is applied 
 
-AliCaloFitResults::AliCaloFitResults(const Int_t maxSig, const Float_t ped, 
-                                    const Short_t fitstatus, const Float_t  amp,  
-                                    const Float_t time,  const Int_t maxTimebin, const Float_t chi,  
-                                    const Int_t ndf, Int_t minSig,
-                                    const AliCaloFitSubarray fitSubarray) : 
+
+AliCaloFitResults::AliCaloFitResults(const Int_t maxSig, 
+                                    const Float_t ped, 
+                                    const Short_t fitstatus, 
+                                    const Float_t  amp,  
+                                    const double time,  
+                                    const Int_t maxTimebin, 
+                                    const Float_t chi,  
+                                    const Int_t ndf, 
+                                    Int_t minSig,
+                                    const AliCaloFitSubarray fitSubarray ) : 
   fMaxSig(maxSig),
   fPed(ped), 
   fStatus(fitstatus),
@@ -60,12 +68,14 @@ AliCaloFitResults::AliCaloFitResults(const Int_t maxSig, const Float_t ped,
   fMinSig(minSig),
   fFitSubarray(fitSubarray) 
 {
+
 }
 
 
+
 AliCaloFitResults::AliCaloFitResults(const Int_t maxSig, const Float_t ped, 
                                     const Short_t fitstatus, const Float_t  amp,  
-                                    const Float_t time, const Int_t maxTimebin, const Float_t chi,  
+                                    const double time, const Int_t maxTimebin, const Float_t chi,  
                                     const Int_t ndf, Int_t minSig ) : 
   fMaxSig(maxSig),
   fPed(ped), 
@@ -76,11 +86,13 @@ AliCaloFitResults::AliCaloFitResults(const Int_t maxSig, const Float_t ped,
   fChi2Sig(chi),
   fNdfSig(ndf),
   fMinSig(minSig),
-  fFitSubarray(kDummy)  
+  fFitSubarray(Ret::kDummy)  
 {
+  
 }
 
 
+
 AliCaloFitResults::AliCaloFitResults(const Int_t maxSig, const Float_t ped, 
                                     const Short_t fitstatus, const Float_t  amp,  
                                     const Int_t maxTimebin) : 
@@ -90,29 +102,32 @@ AliCaloFitResults::AliCaloFitResults(const Int_t maxSig, const Float_t ped,
   fAmpSig(amp),
   fTime(maxTimebin),
   fMaxTimebin(maxTimebin),
-  fChi2Sig( kNoFit ),
-  fNdfSig( kNoFit ),
-  fMinSig( kNoFit ),
-  fFitSubarray( kNoFit ) 
+  fChi2Sig( Ret::kNoFit ),
+  fNdfSig( 0 ),
+  fMinSig( 0 ),
+  fFitSubarray( Ret::kNoFit ) 
 {
+
 }
 
 
+
+
 AliCaloFitResults::AliCaloFitResults(const Int_t maxSig, const Int_t minSig) : 
   fMaxSig(maxSig),
-  fPed( kInvalid ),
-  fStatus( kInvalid ),
-  fAmpSig( kInvalid ), 
-  fTime( kInvalid ),
-  fMaxTimebin( kInvalid ),
-  fChi2Sig( kInvalid ),
-  fNdfSig( kInvalid),
+  fPed( Ret::kInvalid ),
+  fStatus( Ret::kInvalid ),
+  fAmpSig( Ret::kInvalid ), 
+  fTime( Ret::kInvalid ),
+  fMaxTimebin( Ret::kInvalid ),
+  fChi2Sig( Ret::kInvalid ),
+  fNdfSig( 0 ),
   fMinSig (minSig),
-  fFitSubarray(kInvalid)  
+  fFitSubarray( Ret::kInvalid )  
 {
 
 }
-
+ 
 
 
 AliCaloFitResults::~AliCaloFitResults()