Changeset 8964

Timestamp:

06/16/08 01:49:34 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHCamEvent.cc (modified) (3 diffs)
• mjobs/MJStar.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -74 +74 @@
      - UpdatePSHeader not long needed in root >=5.12
      - reorganized header file
+     - Changed backround color to white (_not_ kWhite)
+     - made a sunken border around the canvas
+
+   * mreport/MReportCC.[h,cc]:
+     - removed obsolete fRecTemp
+     - call Copy() in the correct direction
+
+   * mreport/MReportFileRead.[h,cc]:
+     - use a C++ cast instead of a C-cast
+     - add containers to parameter list _before_ calling SetupReading
+     - removed some obsolete comments in the header
+
+   * mjobs/MJStar.cc:
+     - we need to read the new "Rec" tree
+     - and we need to fill from the Rec _and_ CC tree (could give a bias
+       if the rate on both trees would once be identical anymore)
+
+   * mhist/MHCamEvent.cc:
+     - allocate fSum in constructor to allow filling from two different 
+       tasks
 
 

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -94 +94 @@
 {
     Init(name, title);
+
+    fSum = new MHCamera;
 }
 
@@ -105 +107 @@
 {
     Init(name, title);
+
+    fSum = new MHCamera;
 }
 
@@ -144 +148 @@
     }
 
-    // Delete a possible old histogram from a previous loop
-    if (fSum)
-        delete (fSum);
-
     // combine name
     const TString name = fNameEvt.IsNull() ? fName : fNameEvt;
 
-    // create and setup MHCamera
-    fSum = new MHCamera(*cam, name+";avg");
+    fSum->Reset();
+    fSum->SetGeometry(*cam, name+";avg");
+
     if (fTitle!=gsDefTitle)
         fSum->SetTitle(fTitle);

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -187 +187 @@
     readreal.AddTree("Currents",         MReadReports::kRequired);
     readreal.AddTree("CC");
+    readreal.AddTree("Rec");
     readreal.AddTree("Trigger");
     readreal.AddTree("Pyrometer");
@@ -263 +264 @@
     fsum.DenySumTrigger();
     fsum.AllowTriggerLvl1();
+    //fsum.RequireTriggerLvl1();
     fill9.SetFilter(&fsum);
 
@@ -481 +483 @@
 
     // instantiate camera histogram containers
-    MHCamEvent evtdt(0, "DT", "Discriminator Threshold;;DT [au]");
+    MHCamEvent evtdt(0, "Thresholds", "Average Discriminator Thresholds;;DT [au]");
+    plist.AddToList(&evtdt);
 
     // instantiate fill tasks
-    MFillH filldt(&evtdt, "MCameraTH", "FillDT");
+    MFillH filldt1("Thresholds", "MCameraTH", "FillDT-CC");
+    MFillH filldt2("Thresholds", "MCameraTH", "FillDT-Rec");
+    filldt1.SetNameTab("DT");
+    filldt2.SetBit(MFillH::kDoNotDisplay);
+    filldt2.SetBit(MFillH::kCanSkip);
 
     MHSectorVsTime histipr;
@@ -515 +522 @@
         tlist.AddToList(&filldc,  "Currents");
         tlist.AddToList(&fillipr, "Trigger");
-        tlist.AddToList(&filldt,  "CC");
+        tlist.AddToList(&filldt1, "CC");   // Old files: Receiver information in CC-Tree  (Mars<=2.0)
+        tlist.AddToList(&filldt2, "Rec");  // New files: Receiver information in Rec-Tree (Mars >2.0)
     }
     if (!HasNullOut())