Changeset 7632 for trunk

Timestamp:

04/11/06 16:15:21 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mastro/MAstro.h (modified) (1 diff)
• mbase/MLogHtml.cc (modified) (1 diff)
• mjobs/MJSpectrum.cc (modified) (3 diffs)
• mjoptim/MJOptimize.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/04/11 Thomas Bretz
+
+   * mastro/MAstro.h:
+     - added conversion Parsec2Lighyear
+
+   * mbase/MLogHtml.cc:
+     - added a fix to display < and > correctly
+
+   * mhflux/MHCollectionArea.[h,cc]:
+     - commented out obsolete fEnergy parameter
+
+   * mjobs/MJSpectrum.cc:
+     - fill a second collection area plot after trigger
+
+   * mjoptim/MJOptimize.cc:
+     - improve speed of optimization by switching of timing and
+       reset in eventloop
+
+
 
  2006/04/11 Daniel Hoehne, Daniela Dorner

trunk/MagicSoft/Mars/mastro/MAstro.h

@@ -22 +22 @@
 public:
     // Unit conversion
-    static Double_t Parsec2Meter() { return 3.0856776e+16; }
+    static Double_t Parsec2Meter()    { return 3.0856776e+16; }
+    static Double_t Parsec2Lighyear() { return 3.2615644; }
 
 

trunk/MagicSoft/Mars/mbase/MLogHtml.cc

@@ -124 +124 @@
     }
 
-    fOut->write(str, len);
+    TString txt(str);
+
+    txt.ReplaceAll(">", ">");
+    txt.ReplaceAll("<", "&lt;");
+
+    fOut->write(txt.Data(), len);
     if (fUnderline)
     {

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -1082 +1082 @@
     // Fill collection area and energy estimator (unfolding)
     // Make sure to use the same binning for MHCollectionArea and MHEnergyEst
-    MHCollectionArea area;
-    area.SetHistAll(fSimpleMode ? hist : (TH2D&)mh1.GetHist());
+    MHCollectionArea area0("TriggerArea");
+    MHCollectionArea area1;
+    area0.SetHistAll(fSimpleMode ? hist : (TH2D&)mh1.GetHist());
+    area1.SetHistAll(fSimpleMode ? hist : (TH2D&)mh1.GetHist());
+
     MHEnergyEst      hest;
 
-    MFillH fill3(&area, "", "FillCollectionArea");
-    MFillH fill4(&hest, "", "FillEnergyEst");
+    MFillH fill30(&area0, "", "FillTriggerArea");
+    MFillH fill31(&area1, "", "FillCollectionArea");
+    MFillH fill4(&hest,   "", "FillEnergyEst");
     MFillH fill5("MHThreshold", "", "FillThreshold");
-    fill3.SetWeight();
+    fill30.SetWeight();
+    fill31.SetWeight();
     fill4.SetWeight();
     fill5.SetWeight();
-    fill3.SetNameTab("ColArea");
+    fill30.SetNameTab("TrigArea");
+    fill31.SetNameTab("ColArea");
     fill4.SetNameTab("E-Est");
     fill5.SetNameTab("Threshold");
@@ -1141 +1147 @@
     tlist2.AddToList(&weight);
     tlist2.AddToList(&fill1a);
+    tlist2.AddToList(&fill30);
     tlist2.AddToList(fCut0);
     tlist2.AddToList(fCut1);
@@ -1146 +1153 @@
     tlist2.AddToList(fCut3);
     tlist2.AddToList(&taskenv1);
-    tlist2.AddToList(&fill3);
+    tlist2.AddToList(&fill31);
     tlist2.AddToList(&fill4);
     tlist2.AddToList(&fill5);

trunk/MagicSoft/Mars/mjoptim/MJOptimize.cc

@@ -657 +657 @@
     }
 
+    MTaskList *tlist = parlist.FindObject("MTaskList");
+    if (!tlist)
+    {
+        *fLog << err << "MTaskList not found... abort." << endl;
+        return kFALSE;
+    }
+    tlist->SetAccelerator(MTask::kAccDontReset|MTask::kAccDontTime);
+
     MMatrixLoop *loop = dynamic_cast<MMatrixLoop*>(parlist.FindTask("MRead"));
 
@@ -756 +764 @@
     tlist.AddToList(&fillh);
 
+    tlist.SetAccelerator(MTask::kAccDontReset|MTask::kAccDontTime);
+
     MEvtLoop fillloop;
     fillloop.SetParList(&parlist);