Changeset 14814 for fact

Timestamp:

01/31/13 12:35:57 (12 years ago)

Author:

Jens Buss

Message:

new construktor is pulse order, new calculation of phe

Location:

fact/tools/rootmacros/PulseTemplates

Files:

• pulse.C (modified) (5 diffs)
• pulse.h (modified) (1 diff)

fact/tools/rootmacros/PulseTemplates/pulse.C

@@ -52 +52 @@
     mOptions        += options;
     mType           = type;
+    Fit(mName, mOptions, mType);
+}
+
+Pulse::Pulse(TString name, TH1* histo, TString options, int type, int order)
+{
+    InitMembers();
+    mName           = name;
+    mHisto          = histo;
+    mOptions        += options;
+    mType           = type;
+    mOrder          = order;
     Fit(mName, mOptions, mType);
 }
@@ -178 +189 @@
     double tau = 30.0;
     double bsl = 0.8;     //shall be around 0
+    double gain = 10; //startvalue for gain
 
     int first_bin   = mHisto->GetXaxis()->GetFirst();
@@ -189 +201 @@
     double amplitude    = mHisto->GetBinContent(stop);
     double start        = stop-10; //pos 10 slices before maximum
-    int    phe          = amplitude/10;
+    int    phe = 0;
+    if (mOrder < 0)
+    {
+        phe      = (amplitude-bsl)/gain;
+    }
+    else
+    {
+        phe      = mOrder+1;
+    }
     // ======================================================================
 
@@ -233 +253 @@
     // Calculate startvaues for fit
     double tau      = 30.0;
-    double bsl = 0; //MW der ersten zehn slices
-
+    double bsl  = 0; //MW der ersten zehn slices
+    double gain = 10; //startvalue for gain
     int first_bin   = mHisto->GetXaxis()->GetFirst();
 
@@ -245 +265 @@
     double amplitude= mHisto->GetBinContent(stop);
     double start    = stop-10; //pos 10 slices before maximum
-    int    phe      = amplitude/10;
+    int    phe = 0;
+    if (mOrder < 0)
+    {
+        phe      = (amplitude-bsl)/gain;
+    }
+    else
+    {
+        phe      = mOrder+1;
+    }
     // ======================================================================
 

fact/tools/rootmacros/PulseTemplates/pulse.h

@@ -54 +54 @@
     Pulse(TString name, TH1* histo, TString options );
     Pulse(TString name, TH1* histo, TString options, int type);
+    Pulse(TString name, TH1* histo, TString options, int type, int order);
 
     //    /** Copy constructor.