Changeset 3726 for trunk/MagicSoft

Timestamp:

04/13/04 20:44:59 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -54 +54 @@
      - updated documentation, updated QE Cam
      - set the pulser colour (now obligatory)
+     - set the possibility to choose different displays
+ 
 
    * mcalib/MCalibrationChargeCalc.cc

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -38 +38 @@
 //End_Html
 //
+// At the end of the eventloop, plots and results are displayed, depending on 
+// the flags set (see DisplayResult()) 
+// 
+// If the flag SetFullDisplay() is set, all MHCameras will be displayed. 
+// if the flag SetDataCheck() is set, only the most important ones are displayed 
+// Otherwise, (default: SetNormalDisplay()), a good selection of plots is given
+//
 // See also: MHCalibrationChargePix, MHCalibrationChargeCam, MHGausEvents
 //           MHCalibrationChargeBlindPix, MHCalibrationChargePINDiode
@@ -96 +103 @@
 // Default constructor. 
 //
-// Sets fRuns to 0, fColor to kNONE
+// Sets fRuns to 0, fColor to kNONE, fDisplay to kNormalDisplay
 //
 MJCalibration::MJCalibration(const char *name, const char *title) 
-    : fRuns(0), fColor(MCalibrationCam::kNONE)
+    : fRuns(0), fColor(MCalibrationCam::kNONE), fDisplayType(kNormalDisplay)
 {
   fName  = name  ? name  : "MJCalibration";
@@ -193 +200 @@
 //   29) MCalibrationChargePix::GetAbsTimeRms()
 //
+// If the flag SetFullDisplay() is set, all MHCameras will be displayed. 
+// if the flag SetDataCheck() is set, only the most important ones are displayed 
+// and otherwise, (default: SetNormalDisplay()), a good selection of plots is given
+//
 void MJCalibration::DisplayResult(MParList &plist)
 {
@@ -346 +357 @@
     gStyle->SetOptFit();
 
-    // Charges
-    TCanvas &c1 = fDisplay->AddTab("Fit.Charge");
-    c1.Divide(2, 4);
-
-    CamDraw(c1, 1, 2, disp1, 2, 1);
-    CamDraw(c1, 2, 2, disp2, 2, 1);
-
-    // Reduced Sigmas
-    TCanvas &c3 = fDisplay->AddTab("Red.Sigma");
-    c3.Divide(2,4);
-
-    CamDraw(c3, 1, 2, disp3, 2, 1);
-    CamDraw(c3, 2, 2, disp4, 2, 1);
-
-    //  F-Factor
-    TCanvas &c4 = fDisplay->AddTab("Phe's");
-    c4.Divide(3,4);
-
-    CamDraw(c4, 1, 3, disp5, 2, 1);
-    CamDraw(c4, 2, 3, disp6, 2, 1);
-    CamDraw(c4, 3, 3, disp7, 2, 1);
-
-    // QE's
-    TCanvas &c5 = fDisplay->AddTab("QE's");
-    c5.Divide(4,4);
-
-    CamDraw(c5, 1, 4, disp8,  2, 1);
-    CamDraw(c5, 2, 4, disp9,  2, 1);
-    CamDraw(c5, 3, 4, disp10, 2, 1);
-    CamDraw(c5, 4, 4, disp11, 2, 1);
-
-    // Validity
-    TCanvas &c6 = fDisplay->AddTab("Valid");
-    c6.Divide(4,2);
-
-    CamDraw(c6, 1, 4, disp12, 0);
-    CamDraw(c6, 2, 4, disp13, 0);
-    CamDraw(c6, 3, 4, disp14, 0);
-    CamDraw(c6, 4, 4, disp15, 0);
-
-    // Other info
-    TCanvas &c7 = fDisplay->AddTab("HiLoGain");
-    c7.Divide(3,3);
-
-    CamDraw(c7, 1, 3, disp16, 0);
-    CamDraw(c7, 2, 3, disp17, 1);
-    CamDraw(c7, 3, 3, disp18, 1);
-
-    // Pickup
-    TCanvas &c8 = fDisplay->AddTab("Pickup");
-    c8.Divide(4,2);
-
-    CamDraw(c8, 1, 4, disp19, 0);
-    CamDraw(c8, 2, 4, disp20, 0);
-    CamDraw(c8, 3, 4, disp21, 0);
-    CamDraw(c8, 4, 4, disp22, 0);
-
-    // Defects
-    TCanvas &c9 = fDisplay->AddTab("Defect");
-    c9.Divide(5,2);
-
-    CamDraw(c9, 1, 5, disp23, 0);
-    CamDraw(c9, 2, 5, disp24, 0);
-    CamDraw(c9, 3, 5, disp25, 0);
-    CamDraw(c9, 4, 5, disp26, 0);
-    CamDraw(c9, 5, 5, disp27, 0);
-
-    // Abs. Times
-    TCanvas &c10 = fDisplay->AddTab("Abs. Times");
-    c10.Divide(2,3);
+    if (fDisplayType == kDataCheck)
+      {
+        TCanvas &c1 = fDisplay->AddTab("Fit.Charge");
+        c1.Divide(3, 3);
+        
+        CamDraw(c1, 1, 3, disp1, 2);
+        CamDraw(c1, 2, 3, disp4, 2);
+        CamDraw(c1, 3, 3, disp28, 2);
+
+        //  F-Factor
+        TCanvas &c2 = fDisplay->AddTab("Phe's");
+        c2.Divide(3,4);
+        
+        CamDraw(c2, 1, 3, disp6, 2, 1);
+        CamDraw(c2, 2, 3, disp7, 2, 1);
+        CamDraw(c2, 3, 3, disp8, 2, 1);
+
+        // QE's
+        TCanvas &c3 = fDisplay->AddTab("QE's");
+        c3.Divide(3,4);
+
+        CamDraw(c3, 1, 3, disp8,  2, 1);
+        CamDraw(c3, 2, 3, disp9,  2, 1);
+        CamDraw(c3, 3, 3, disp10, 2, 1);
+
+        // Defects
+        TCanvas &c4 = fDisplay->AddTab("Defect");
+        c4.Divide(3,2);
+        
+        CamDraw(c4, 1, 3, disp23, 0);
+        CamDraw(c4, 2, 3, disp24, 0);
+        CamDraw(c4, 3, 3, disp25, 0);
+
+        return;
+      }
     
-    CamDraw(c10, 1, 2, disp28, 2);
-    CamDraw(c10, 2, 2, disp29, 1);
-
+    if (fDisplayType == kNormalDisplay)
+      {
+
+        // Charges
+        TCanvas &c11 = fDisplay->AddTab("Fit.Charge");
+        c11.Divide(2, 4);
+        
+        CamDraw(c11, 1, 2, disp1, 2, 1);
+        CamDraw(c11, 2, 2, disp2, 2, 1);
+        
+        // Reduced Sigmas
+        TCanvas &c12 = fDisplay->AddTab("Red.Sigma");
+        c12.Divide(2,4);
+        
+        CamDraw(c12, 1, 2, disp3, 2, 1);
+        CamDraw(c12, 2, 2, disp4, 2, 1);
+        
+        //  F-Factor
+        TCanvas &c13 = fDisplay->AddTab("Phe's");
+        c13.Divide(3,4);
+        
+        CamDraw(c13, 1, 3, disp5, 2, 1);
+        CamDraw(c13, 2, 3, disp6, 2, 1);
+        CamDraw(c13, 3, 3, disp7, 2, 1);
+        
+        // QE's
+        TCanvas &c14 = fDisplay->AddTab("QE's");
+        c14.Divide(4,4);
+        
+        CamDraw(c14, 1, 4, disp8,  2, 1);
+        CamDraw(c14, 2, 4, disp9,  2, 1);
+        CamDraw(c14, 3, 4, disp10, 2, 1);
+        CamDraw(c14, 4, 4, disp11, 2, 1);
+        
+        // Defects
+        TCanvas &c15 = fDisplay->AddTab("Defect");
+        c15.Divide(5,2);
+        
+        CamDraw(c15, 1, 5, disp23, 0);
+        CamDraw(c15, 2, 5, disp24, 0);
+        CamDraw(c15, 3, 5, disp25, 0);
+        CamDraw(c15, 4, 5, disp26, 0);
+        CamDraw(c15, 5, 5, disp27, 0);
+        
+        // Abs. Times
+        TCanvas &c16 = fDisplay->AddTab("Abs. Times");
+        c16.Divide(2,3);
+        
+        CamDraw(c16, 1, 2, disp28, 2);
+        CamDraw(c16, 2, 2, disp29, 1);
+
+        return;
+      }
+    
+    if (fDisplayType == kFullDisplay)
+      {
+
+        // Charges
+        TCanvas &c21 = fDisplay->AddTab("Fit.Charge");
+        c21.Divide(2, 4);
+        
+        CamDraw(c21, 1, 2, disp1, 2, 1);
+        CamDraw(c21, 2, 2, disp2, 2, 1);
+        
+        // Reduced Sigmas
+        TCanvas &c23 = fDisplay->AddTab("Red.Sigma");
+        c23.Divide(2,4);
+        
+        CamDraw(c23, 1, 2, disp3, 2, 1);
+        CamDraw(c23, 2, 2, disp4, 2, 1);
+        
+        //  F-Factor
+        TCanvas &c24 = fDisplay->AddTab("Phe's");
+        c24.Divide(3,4);
+        
+        CamDraw(c24, 1, 3, disp5, 2, 1);
+        CamDraw(c24, 2, 3, disp6, 2, 1);
+        CamDraw(c24, 3, 3, disp7, 2, 1);
+        
+        // QE's
+        TCanvas &c25 = fDisplay->AddTab("QE's");
+        c25.Divide(4,4);
+        
+        CamDraw(c25, 1, 4, disp8,  2, 1);
+        CamDraw(c25, 2, 4, disp9,  2, 1);
+        CamDraw(c25, 3, 4, disp10, 2, 1);
+        CamDraw(c25, 4, 4, disp11, 2, 1);
+        
+        // Validity
+        TCanvas &c26 = fDisplay->AddTab("Valid");
+        c26.Divide(4,2);
+        
+        CamDraw(c26, 1, 4, disp12, 0);
+        CamDraw(c26, 2, 4, disp13, 0);
+        CamDraw(c26, 3, 4, disp14, 0);
+        CamDraw(c26, 4, 4, disp15, 0);
+        
+        // Other info
+        TCanvas &c27 = fDisplay->AddTab("HiLoGain");
+        c27.Divide(3,3);
+        
+        CamDraw(c27, 1, 3, disp16, 0);
+        CamDraw(c27, 2, 3, disp17, 1);
+        CamDraw(c27, 3, 3, disp18, 1);
+        
+        // Pickup
+        TCanvas &c28 = fDisplay->AddTab("Pickup");
+        c28.Divide(4,2);
+        
+        CamDraw(c28, 1, 4, disp19, 0);
+        CamDraw(c28, 2, 4, disp20, 0);
+        CamDraw(c28, 3, 4, disp21, 0);
+        CamDraw(c28, 4, 4, disp22, 0);
+        
+        // Defects
+        TCanvas &c29 = fDisplay->AddTab("Defect");
+        c29.Divide(5,2);
+        
+        CamDraw(c29, 1, 5, disp23, 0);
+        CamDraw(c29, 2, 5, disp24, 0);
+        CamDraw(c29, 3, 5, disp25, 0);
+        CamDraw(c29, 4, 5, disp26, 0);
+        CamDraw(c29, 5, 5, disp27, 0);
+        
+        // Abs. Times
+        TCanvas &c30 = fDisplay->AddTab("Abs. Times");
+        c30.Divide(2,3);
+        
+        CamDraw(c30, 1, 2, disp28, 2);
+        CamDraw(c30, 2, 2, disp29, 1);
+
+        return;
+      }
 }
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -31 +31 @@
 
   MCalibrationCam::PulserColor_t fColor;                   // Colour of the pulsed LEDs
+
+  enum  Display_t { kFullDisplay, kDataCheck, kNormalDisplay }; // Possible Display types
+  Display_t fDisplayType;                                  // Chosen Display type
   
   void DrawProjection   ( MHCamera *obj, Int_t fit) const; // Draw projection of pixels values
@@ -56 +59 @@
   void SetQECam    (const MCalibrationQECam &qe) { qe.Copy(fQECam);        }    
   void SetColor    (const MCalibrationCam::PulserColor_t color) { fColor = color;   }
+
+  // Displays
+  void SetFullDisplay()  { fDisplayType = kFullDisplay;  }
+  void SetDataCheck()  { fDisplayType = kDataCheck;  }
+  void SetNormalDisplay()  { fDisplayType = kNormalDisplay;  }
   
   Bool_t ReadCalibrationCam();