Changeset 7001 for trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

Timestamp:

05/09/05 10:15:41 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -178 +178 @@
         return -1;
 
+    TObject *hist = arr.FindObjectInCanvas("Hist", "MHAlpha", "Hist");
+    cout << "HIST: " << hist << endl;
+    if (hist)
+        cout << "TYPE: " << hist->ClassName() << endl;
+    arr.Print();
+
     vstime->Copy(h1);
     size->Copy(h2);
@@ -344 +350 @@
     taskenv1.SetDefault(fEstimateEnergy ? fEstimateEnergy : &est);
 
-    MFillH fill1("HistOff [MHAlpha]", "MHillasSrc", "FillHistOff");
-    MFillH fill2("HistOn  [MHAlpha]", "MHillasSrc", "FillHistOn");
+    MFillH fill1("HistEOff [MHAlpha]", "MHillasSrc", "FillHistEOff");
+    MFillH fill2("HistE    [MHAlpha]", "MHillasSrc", "FillHistE");
 
     MFDataMember f0("DataType.fVal", '<', 0.5, "FilterOffData");
@@ -382 +388 @@
     }
 
-    const MHAlpha *halpha = (MHAlpha *)plist.FindObject("HistOn");
+    const MHAlpha *halpha = (MHAlpha *)plist.FindObject("HistE");
     if (!halpha)
     {
-        *fLog << err << GetDescriptor() << ": HistOn [MHAlpha] not found... abort." << endl;
+        *fLog << err << GetDescriptor() << ": HistE [MHAlpha] not found... abort." << endl;
         return kFALSE;
     }
@@ -597 +603 @@
     *fLog << inf << "Reading from file: " << fPathIn << endl;
 
-    cout << "Opening..." << endl;
     TFile file(fPathIn, "READ");
     if (!file.IsOpen())
@@ -605 +610 @@
     }
 
-    cout << "Reading..." << endl;
     file.cd();
     MStatusArray arr;
@@ -614 +618 @@
     }
 
-    cout << "Searching..." << endl;
-
     TH1 *excess = (TH1D*)arr.FindObjectInCanvas("Excess", "TH1D", "Hist");
     if (!excess)
         return kFALSE;
-
-    cout << "Displaying..." << endl;
 
     // ------------------- Plot excess versus size ------------------- 
@@ -638 +638 @@
     // Don't do this on the original object!
     excess->SetStats(kFALSE);
-
-    cout << "ExcessSize..." << endl;
 
     TObject *o=0;
@@ -656 +654 @@
     }
 
-    cout << "Dist..." << endl;
-
     // -------------- Comparison of Image Parameters --------------
     c.cd(2);
     PlotSame(arr, plist, "Dist",   "HilSrc",  "MHHilSrcMCPost");
 
-    cout << "Length..." << endl;
-
     c.cd(3);
     PlotSame(arr, plist, "Length", "PostCut", "MHHillasMCPost");
 
-    cout << "M3l..." << endl;
-
     c.cd(4);
     PlotSame(arr, plist, "M3l",    "HilExt",  "MHHilExtMCPost");
 
-    cout << "Conc1..." << endl;
-
     c.cd(5);
     PlotSame(arr, plist, "Conc1",  "NewPar",  "MHNewParMCPost");
-
-    cout << "Width..." << endl;
 
     c.cd(6);
@@ -710 +698 @@
     MBinning bins7("BinningDist");
     MBinning bins8("BinningMaxDist");
+    MBinning bins9("BinningM3Long");
+    MBinning bins0("BinningConc1");
 
     MAlphaFitter fit;
@@ -722 +712 @@
     plist.AddToList(&bins7);
     plist.AddToList(&bins8);
+    plist.AddToList(&bins9);
+    plist.AddToList(&bins0);
     plist.AddToList(&fit);