Changeset 5158

Timestamp:

10/01/04 17:34:52 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mhist/MHCamEvent.cc (modified) (1 diff)
• mhist/MHCamEventRot.cc (modified) (4 diffs)
• mjobs/MJStar.cc (modified) (1 diff)
• mjobs/MJob.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -53 +53 @@
 //    Make sure to set an empty x-axis title.
 //
-//
 // For example:
 //   MHCamEvent myhist("Titele;;y [cm]");

trunk/MagicSoft/Mars/mhist/MHCamEventRot.cc

@@ -29 +29 @@
 // Derotate MCamEvent before filling a 2D histogram.
 //
-// To be done: Set the sky position of the center of the display and
-//             correct if the pointing position of the telescope is
-//             different
+// Axis titles
+// ===========
+//
+// 1) If no other title is given 'a.u.' or 'counts'is used.
+// 2) If the corresponding MBinning has no default title. This title
+//    is used for the z-axis
+// 3) If the title of MHCamEvent is different from the default,
+//    it is used as histogram title. You can use this to set the
+//    axis title, too. For more information see TH1::SetTitle, eg.
+//       SetTitle("MyHist;;;z[photons]");
+//    The x- and y-axis title is ignored.
+//
+// For example:
+//   MHCamEventRot myhist("Title;;;z[photons]");
+//
+//
+// To be done: * Set the sky position of the center of the display and
+//               correct if the pointing position of the telescope is
+//               different.
+//             * Make it quadratic like MHCamera
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -66 +83 @@
 using namespace std;
 
+const TString MHCamEventRot::gsDefName  = "MHCamEventRot";
+const TString MHCamEventRot::gsDefTitle = "Plot showing derotated MCamEvent data";
+
 // --------------------------------------------------------------------------
 //
@@ -77 +97 @@
     //   set the name and title of this object
     //
-    fName  = name  ? name  : "MHCamEventRot";
-    fTitle = title ? title : "Plot showing derotated MCamEvent data";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     fHist.SetDirectory(NULL);
 
-    fHist.SetName("Alpha");
+    fHist.SetName("Derot");
     fHist.SetTitle("2D-plot of MCamEvents (derotated)");
-    fHist.SetXTitle("x [\\circ]");
-    fHist.SetYTitle("y [\\circ]");
-    fHist.SetZTitle("Counts");
 }
 
@@ -137 +154 @@
         fDec = fPointPos->GetDec();
     }
+
+    if (bins && bins->HasTitle())
+        fHist.SetZTitle(bins->GetTitle());
+    else
+        if (fTitle!=gsDefTitle)
+        {
+            fHist.SetTitle(fTitle);
+            fHist.SetXTitle("x [\\circ]");
+            fHist.SetYTitle("y [\\circ]");
+        }
+        else
+            if (!fTitle.Contains(";"))
+                fHist.SetZTitle(fUseThreshold==kNoBound?"a.u.":"Counts");
 
     return kTRUE;

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -294 +294 @@
     tlist2.AddToList(&fill0a);
     tlist2.AddToList(&fill0b);
-    tlist2.AddToList(&fill0r);
+    //tlist2.AddToList(&fill0r);
     tlist2.AddToList(&hcalc);
     tlist2.AddToList(&fill1);

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -211 +211 @@
         if (o->Read(o->GetName())<=0)
         {
-            *fLog << err << dbginf << "ERROR - Writing " << o->GetDescriptor() << " to file " << gFile->GetName() << endl;
+            *fLog << err << dbginf << "ERROR - Reading " << o->GetDescriptor() << " from file " << gFile->GetName() << endl;
             return kFALSE;
         }