Changeset 3456

Timestamp:

03/10/04 17:07:23 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (2 diffs)
• mjobs/MJPedestal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
        of photo-electrons from inner and outer pixels, respectively
 
+   * mjobs/MJPedestal.cc
+   * mjobs/MJCalibration.cc
+   * macros/calibration.C
+     - fixed the projections (did only display inner pixels up to now)
+ 
 
  2004/03/10: Thomas Bretz

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -46 +46 @@
 
 #include "MHCamera.h"
+#include "MGeomCam.h"
 
 #include "MPedestalCam.h"
@@ -83 +84 @@
   obj2->Draw();
   obj2->SetBit(kCanDelete);
+  
+  if (obj1->GetGeomCam().InheritsFrom("MGeomCamMagic"))
+    {
+      TArrayI s0(3);
+      s0[0] = 6;
+      s0[1] = 1;
+      s0[2] = 2;
+      
+      TArrayI s1(3);
+      s1[0] = 3;
+      s1[1] = 4;
+      s1[2] = 5;
+      
+      TArrayI inner(1);
+      inner[0] = 0;
+      
+      TArrayI outer(1);
+      outer[0] = 1;
+      
+      // Just to get the right (maximum) binning
+      TH1D *half[4];
+      half[0] = obj1->ProjectionS(s0, inner, "Sector 6-1-2 Inner");
+      half[1] = obj1->ProjectionS(s1, inner, "Sector 3-4-5 Inner");
+      half[2] = obj1->ProjectionS(s0, outer, "Sector 6-1-2 Outer");
+      half[3] = obj1->ProjectionS(s1, outer, "Sector 3-4-5 Outer");
+      
+      for (int i=0; i<4; i++)
+        {
+          half[i]->SetLineColor(kRed+i);
+          half[i]->SetDirectory(0);
+          half[i]->SetBit(kCanDelete);
+          half[i]->Draw("same");
+        }
+    }
   
   const Double_t min   = obj2->GetBinCenter(obj2->GetXaxis()->GetFirst());

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -132 +132 @@
         inner[0] = 0;
 
+        TArrayI outer(1);
+        outer[0] = 1;
+
         // Just to get the right (maximum) binning
-        TH1D *half[2];
-        half[0] = obj1->ProjectionS(s0, inner, "Sector 6-1-2");
-        half[1] = obj1->ProjectionS(s0, inner, "Sector 3-4-5");
+        TH1D *half[4];
+        half[0] = obj1->ProjectionS(s0, inner, "Sector 6-1-2 Inner");
+        half[1] = obj1->ProjectionS(s1, inner, "Sector 3-4-5 Inner");
+        half[2] = obj1->ProjectionS(s0, outer, "Sector 6-1-2 Outer");
+        half[3] = obj1->ProjectionS(s1, outer, "Sector 3-4-5 Outer");
         /*
          half[0]->Reset();
@@ -145 +150 @@
          half[(i/3)%2]->Add(obj1->ProjectionS(i, "Dummy"));
          */
-        for (int i=0; i<2; i++)
+        for (int i=0; i<4; i++)
         {
             half[i]->SetLineColor(kRed+i);