Changeset 3238

Timestamp:

02/19/04 10:39:30 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MWriteAsciiFile.cc (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
      - Don't call Sumw2() anymore for projection
 
-   * mjobs/MJExtractSignal.cc:
+   * mjobs/MJPedestal.cc:
      - added MPedestalCam to output again - MPedestalCam was fixed
        yesterday

trunk/MagicSoft/Mars/mfileio/MWriteAsciiFile.cc

@@ -199 +199 @@
     while ((obj=(MParContainer*)Next()))
     {
+        //
+        // Check for the Write flag
+        //
         if (!obj->IsReadyToSave())
             continue;
 
+        //
+        // Write container to file
+        //
         if (!obj->AsciiWrite(*fOut))
             continue;
 
+        //
+        // Store that at least one container was written
+        //
         written = kTRUE;
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -47 +47 @@
 #include "MStatusDisplay.h"
 
+#include "MGeomCam.h"
 #include "MHCamera.h"
 #include "MPedestalCam.h"
@@ -114 +115 @@
     obj2->Draw();
     obj2->SetBit(kCanDelete);
+    gPad->SetLogy();
+
+    if (obj1->GetGeomCam().InheritsFrom("MGeomCamMagic"))
+    {
+        // Just to get the right (maximum) binning
+        TH1D *half[2];
+        half[0] = obj1->Projection("Sector 6-1-2");
+        half[1] = obj1->Projection("Sector 3-4-5");
+
+        half[0]->Reset();
+        half[1]->Reset();
+
+        TH1D *dummy = obj1->Projection("Dummy");
+
+        for (int i=1; i<7/*obj1->GetGeomCam().GetNumSectors()*/; i++)
+            half[(i/3)%2]->Add(obj1->ProjectionS(i, "Dummy"));
+
+        for (int i=0; i<2; i++)
+        {
+            half[i]->SetLineColor(kRed+i);
+            half[i]->SetDirectory(0);
+            half[i]->SetBit(kCanDelete);
+            half[i]->Draw("same");
+        }
+
+        delete dummy;
+    }
 
     const Double_t min   = obj2->GetBinCenter(obj2->GetXaxis()->GetFirst());
@@ -209 +237 @@
     //
     MHCamera disp0(geomcam, "MPedestalCam;ped", "Pedestals");
-    MHCamera disp1(geomcam, "MPedestalCam;rms", "Pedestal RMS");
+    MHCamera disp1(geomcam, "MPedestalCam;var", "Sigma Pedestal");
 
     disp0.SetCamContent(fPedestalCam, 0);
@@ -218 +246 @@
 
     disp0.SetYTitle("P [fadc/slice]");
-    disp1.SetYTitle("P_{RMS} [fadc/slice]");
+    disp1.SetYTitle("\\sigma_{P} [fadc/slice]");
 
     //