Changeset 6200 for trunk/MagicSoft

Timestamp:

02/02/05 15:02:35 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibTest.cc (modified) (5 diffs)
• MJCalibTest.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -129 +129 @@
   MHCamera disp3 (geomcam, "Test;PhotonsPerArea",    "Equiv. Cherenkov Photons per Area");
   MHCamera disp4 (geomcam, "Test;SigmaPhotPerArea",  "Sigma equiv. Cher. Photons per Area");
-  MHCamera disp5 (geomcam, "Test;Phot",              "Calibrated Photons");
-  MHCamera disp6 (geomcam, "Test;PhotPerArea",       "Calibrated Photons per Area");
+  MHCamera disp5 (geomcam, "Test;Phot",              "Calibrated Photons from Fit");
+  MHCamera disp6 (geomcam, "Test;PhotPerArea",       "Calibrated Photons per Area from Fit");
   MHCamera disp7 (geomcam, "Test;NotInterpolate",    "Not interpolated pixels");
   MHCamera disp8 (geomcam, "Test;DeviatingPhots",    "Deviating Number Photons");
+  MHCamera disp9 (geomcam, "Test;Arr.Times",         "Mean of calibrated Arr.Times");
+  MHCamera disp10(geomcam, "Test;SigmaArr.Times",    "Sigma of calibrated Arr.Times");
+
 
   // Fitted charge means and sigmas
@@ -152 +155 @@
   disp8.SetCamError(  fBadPixels, 22);
 
+  disp9.SetCamContent(fTestTimeCam,  0);
+  disp9.SetCamError(  fTestTimeCam,  1);
+  disp10.SetCamContent(fTestTimeCam,  2);
+  disp10.SetCamError(  fTestTimeCam,  3);
+
 
   disp1.SetYTitle("Photons");
@@ -163 +171 @@
   disp8.SetYTitle("[1]");
   
-  gStyle->SetOptStat(1111);
-  gStyle->SetOptFit();
-
-  if (fDisplayType == kNormalDisplay)
-    {
-
-      TCanvas &c = fDisplay->AddTab("TestCharges");
-      c.Divide(4,4);
-      
-      disp1.CamDraw(c, 1, 4, 2, 1);
-      disp2.CamDraw(c, 2, 4, 2, 1);        
-      disp3.CamDraw(c, 3, 4, 1, 1);        
-      disp4.CamDraw(c, 4, 4, 2, 1);        
-    }
+  disp9.SetYTitle("Mean Arr.Times [FADC units]");
+  disp10.SetYTitle("\\sigma_{t} [FADC units]");
+  
+  TCanvas &c = fDisplay->AddTab("TestCharges");
+  c.Divide(4,4);
+  
+  disp1.CamDraw(c, 1, 4, 2, 1);
+  disp2.CamDraw(c, 2, 4, 2, 1);        
+  disp3.CamDraw(c, 3, 4, 1, 1);        
+  disp4.CamDraw(c, 4, 4, 2, 1);        
   
   TCanvas &c2 = fDisplay->AddTab("TestResult");
@@ -190 +194 @@
   disp8.CamDraw(c3, 2, 2, 0);        
 
-  return;
-
-}
-
-
-void MJCalibTest::DisplayResultT(MParList &plist)
-{
-  if (!fDisplay)
-    return;
-  
   //
-  // Update display
-  //
-  TString title = fDisplay->GetTitle();
-  title += "--  Extraction-Calibration-Test-Time";
-  title += fRuns->GetRunsAsString();
-  title += "  --";
-  fDisplay->SetTitle(title);
-
-  //
-  // Get container from list
-  //
-  MGeomCam &geomcam = *(MGeomCam*)plist.FindObject("MGeomCam");
-  
-  // Create histograms to display
-  MHCamera disp1 (geomcam, "Test;Arr.Times",           "Mean of calibrated Arr.Times");
-  MHCamera disp2 (geomcam, "Test;SigmaArr.Times",      "Sigma of calibrated Arr.Times");
-
-  // Fitted charge means and sigmas
-  disp1.SetCamContent(fTestTimeCam,  0);
-  disp1.SetCamError(  fTestTimeCam,  1);
-  disp2.SetCamContent(fTestTimeCam,  2);
-  disp2.SetCamError(  fTestTimeCam,  3);
-
-  disp1.SetYTitle("Mean Arr.Times [FADC units]");
-  disp2.SetYTitle("\\sigma_{t} [FADC units]");
-  
-  gStyle->SetOptStat(1111);
-  gStyle->SetOptFit();
-
-  TCanvas &c = fDisplay->AddTab("TestTimes");
-  c.Divide(2,4);
-
-  disp1.CamDraw(c, 1, 2,  5, 1);
-  disp2.CamDraw(c, 2, 2,  5, 1);        
+  // Display times
+  // 
+  TCanvas &c4 = fDisplay->AddTab("TestTimes");
+  c4.Divide(2,4);
+
+  disp9.CamDraw(c4, 1, 2,  5, 1);
+  disp10.CamDraw(c4, 2, 2,  5, 1);        
 
   return;
@@ -556 +523 @@
   MFillH fill2(&evt2, "MArrivalTime","FillTimes");
   
-  MFillH fillcam("MHCalibrationTestCam", "MCerPhotEvt");
-  fillcam.SetNameTab("Test");
-  MFillH filltme("MHCalibrationTestTimeCam", "MArrivalTime");
-  filltme.SetNameTab("TestTime");
+  MFillH fillcam("MHCalibrationTestCam",     "MCerPhotEvt" ,"FillTest");
+  MFillH filltme("MHCalibrationTestTimeCam", "MArrivalTime","FillTestTime");
+  fillcam.SetBit(MFillH::kDoNotDisplay);
+  filltme.SetBit(MFillH::kDoNotDisplay);
 
   MFCosmics cosmics;

trunk/MagicSoft/Mars/mjobs/MJCalibTest.h

@@ -55 +55 @@
 
   void   DisplayResult(MParList &plist);
-  void   DisplayResultT(MParList &plist);
 
   Bool_t WriteResult();