Changeset 1462 for trunk/WuerzburgSoft/Thomas/mphys

Timestamp:

07/31/02 14:54:30 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/WuerzburgSoft/Thomas/mphys

Files:

• Changelog (modified) (1 diff)
• MCascade.cc (modified) (7 diffs)
• MCascade.h (modified) (1 diff)
• MFit.h (modified) (1 diff)

trunk/WuerzburgSoft/Thomas/mphys/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2002/06/29: Thomas Bretz
+
+   * MCascade.[h,cc]:
+     - replaces draw by fIsBatch, using gROOT->IsBatch in addition.
+
+   * MFit.h:
+     - added default=0 to SetParameter for min and max
+
+
+
  2002/06/29: Thomas Bretz
 

trunk/WuerzburgSoft/Thomas/mphys/MCascade.cc

@@ -292 +292 @@
         Esum += ProcessGammas(fListGammas, fListElectrons, weight);
 
-        fListGammas.ForEach(MPhoton, Fill)(fHist, fDisplayIndex, weight);
+        if (!fIsBatch)
+            fListGammas.ForEach(MPhoton, Fill)(fHist, fDisplayIndex, weight);
         fListGammas.Delete();
 
@@ -355 +356 @@
 void MCascade::Run(TString filename, Bool_t draw)
 {
+    fIsBatch = gROOT->IsBatch() ? kFALSE : draw;
+
     cout << "R = " << fSrcR << "kpc" << endl;
     cout << "Z = " << fSrcZ << endl;
@@ -371 +374 @@
     TCanvas *c=NULL;
 
-    if (draw)
+    if (!fIsBatch)
     {
         fHist.SetMinimum(pow(fELo, fSpectralIndex+fDisplayIndex)/100);
@@ -409 +412 @@
 
     TTimer timer("gSystem->ProcessEvents();", 333, kFALSE);
-    if (draw)
+    if (!fIsBatch)
         timer.TurnOn();
 
@@ -426 +429 @@
             Double_t E = GetEnergy();
             Double_t weight = pow(E, fSpectralIndex);
-            histsrc.Fill(E, pow(E, fDisplayIndex) * weight);
+
+            if (!fIsBatch)
+                histsrc.Fill(E, pow(E, fDisplayIndex) * weight);
 
             cout << "--> " << n << ". " << Form("%d: %3.1e", (int)(starttime+fRuntime-TStopwatch::GetRealTime()), E) << flush;
@@ -432 +437 @@
             ProcessPrimaryGamma(E, weight);
 
-            if (!draw)
+            if (fIsBatch)
                 continue;
 
@@ -458 +463 @@
     // ------------------------------
 
-    if (draw)
+    if (!fIsBatch)
     {
         c->Clear();

trunk/WuerzburgSoft/Thomas/mphys/MCascade.h

@@ -46 +46 @@
     TH1D fHist; //!
 
+    Bool_t fIsBatch; //!
+
     Double_t GetEnergy();
     TFile *OpenFile(TString fFilename);

trunk/WuerzburgSoft/Thomas/mphys/MFit.h

@@ -89 +89 @@
 
     void Print(Option_t *opt="") const;
-    void SetParameter(Int_t n, TString name, Double_t start, Double_t min, Double_t max);
+    void SetParameter(Int_t n, TString name, Double_t start, Double_t min=0, Double_t max=0);
 
     Double_t GetParameter(Int_t n) const;