Index: fact/tools/rootmacros/PulseTemplates/pulse.C
===================================================================
--- fact/tools/rootmacros/PulseTemplates/pulse.C	(revision 14478)
+++ fact/tools/rootmacros/PulseTemplates/pulse.C	(revision 14479)
@@ -60,4 +60,64 @@
     delete mModel;
 }
+
+// ===========================================================================
+// PUBLIC OPERATIONS
+// ===========================================================================
+
+void
+Pulse::Fit(
+        TString fitName,
+        TString fitOptions,
+        int     type
+        )
+{
+    int fitMin = mHisto->GetXaxis()->GetFirst();
+    int fitMax = mHisto->GetXaxis()->GetLast();
+
+    Fit(
+        fitName,
+        fitOptions,
+        type,
+        fitMin,
+        fitMax
+        );
+}
+
+void
+Pulse::Fit(
+        TString fitName,
+        TString fitOptions,
+        int     type,
+        int     fitMin,
+        int     fitMax
+        )
+{
+    fitOptions += "R";
+    if (type == 0)
+        FitSectionWise(
+            fitName,
+            fitOptions,
+            fitMin,
+            fitMax
+        );
+    else if (type == 1)
+        FitContious(
+            fitName,
+            fitOptions,
+            fitMin,
+            fitMax
+        );
+    else{
+        cout << "not a correct type number --> fitting skipped!" << endl;
+        return;
+    }
+
+    CalculateParameters();
+    return;
+}
+
+// ===========================================================================
+// PRIVATE OPERATIONS
+// ===========================================================================
 
 void
@@ -85,56 +145,4 @@
 
 void
-Pulse::Fit(
-        TString fitName,
-        TString fitOptions,
-        int type
-        )
-{
-    int     fitMin = mHisto->GetXaxis()->GetFirst();
-    int     fitMax = mHisto->GetXaxis()->GetLast();
-
-    Fit(
-        fitName,
-        fitOptions,
-        type,
-        fitMin,
-        fitMax
-        );
-}
-
-void
-Pulse::Fit(
-        TString fitName,
-        TString fitOptions,
-        int type,
-        int fitMin,
-        int fitMax
-        )
-{
-    fitOptions += "R";
-    if (type == 0)
-        FitSectionWise(
-                    "Model0",
-                    fitOptions,
-                    fitMin,
-                    fitMax
-                    );
-    else if (type == 1)
-        FitContious(
-                    "Model1",
-                    fitOptions,
-                    fitMin,
-                    fitMax
-                    );
-    else{
-        cout << "not a correct type number --> fitting skipped!" << endl;
-        return;
-    }
-
-    CalculateParameters();
-    return;
-}
-
-void
 Pulse::FitSectionWise(
         TString fitName,
@@ -227,14 +235,4 @@
 }
 
-double  Pulse::GetBsl(){ return mBsl;}
-double  Pulse::GetHeight(){ return mHeight;}
-double  Pulse::GetAvalancheStart(){ return mT0;}
-double  Pulse::GetAvalancheEnd(){ return mT1;}
-double  Pulse::GetTimeConstRising(){ return mTau1;}
-double  Pulse::GetTimeConstFalling(){ return mTau2;}
-double  Pulse::GetIntegral(){ return mIntegral;}
-double  Pulse::GetAmplitude(){ return mAmplitude;}
-int     Pulse::GetPE(){ return mPhE;}
-
 void
 Pulse::CalculateParameters()
@@ -248,4 +246,30 @@
 }
 
+// ===========================================================================
+// ACCESS
+// ===========================================================================
+
+TString Pulse::GetName(){ return mName;}
+double  Pulse::GetBsl(){ return mBsl;}
+double  Pulse::GetHeight(){ return mHeight;}
+double  Pulse::GetT0(){ return mT0;}
+double  Pulse::GetT1(){ return mT1;}
+double  Pulse::GetTau1(){ return mTau1;}
+double  Pulse::GetTau2(){ return mTau2;}
+double  Pulse::GetIntegral(){ return mIntegral;}
+double  Pulse::GetAmplitude(){ return mAmplitude;}
+int     Pulse::GetPhe(){ return mPhE;}
+int     Pulse::GetType(){return mType;}
+int     Pulse::GetFitMin(){return mFitMin;}
+int     Pulse::GetFitMax(){return mFitMax;}
+double  Pulse::GetFitProb(){return mFitProb;}
+double  Pulse::GetFitNCalls(){return mFitNCalls;}
+double  Pulse::GetFitNdf(){return mFitNdf;}
+double  Pulse::GetChi2(){return mChi2;}
+
+
+// ===========================================================================
+// NON CLASS MATH FUNCTIONS
+// ===========================================================================
 
 //double
Index: fact/tools/rootmacros/PulseTemplates/pulse.h
===================================================================
--- fact/tools/rootmacros/PulseTemplates/pulse.h	(revision 14478)
+++ fact/tools/rootmacros/PulseTemplates/pulse.h	(revision 14479)
@@ -34,4 +34,5 @@
 /**
 */
+// NON CLASS MATH FUNCTIONS
 int     Heaviside(double val);
 double  shapeFunc(   double* t, double* par);
@@ -86,13 +87,21 @@
     double  GetBsl();
     double  GetHeight();
-    double  GetAvalancheStart();
-    double  GetAvalancheEnd();
-    double  GetTimeConstRising();
-    double  GetTimeConstFalling();
+    double  GetT0();
+    double  GetT1();
+    double  GetTau1();
+    double  GetTau2();
     double  GetIntegral();
     double  GetAmplitude();
-    int     GetPE();
+    int     GetPhe();
+    int     GetType();
+    int     GetFitMin();
+    int     GetFitMax();
+    double  GetFitProb();
+    double  GetFitNCalls();
+    double  GetFitNdf();
+    double  GetChi2();
 
 // INQUIRY
+private:
     TString mName;
     TH1*    mHisto;