Changeset 3974

Timestamp:

05/05/04 16:03:46 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
        pedestal. About 6 times faster than MArrivalTimeCalc
 
+   * mjobs/MJCalibration.cc
+     - changed names of the MHCameras to contain run name
 
  2004/05/04: Raquel de los Reyes

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -111 +111 @@
 #include "MHCalibrationCam.h"
 #include "MHCalibrationChargeCam.h"
+#include "MHCalibrationChargeBlindPix.h"
 #include "MHCalibrationRelTimeCam.h"
 #include "MCalibrationRelTimeCam.h"
@@ -131 +132 @@
 
 #include "MArrivalTimeCam.h"
-#include "MArrivalTimeCalc.h"
-#include "MArrivalTimeCalc2.h"
 
 #include "MStatusDisplay.h"
@@ -220 +219 @@
 
     // Create histograms to display
-    MHCamera disp1 (geomcam, "Charge",            "Fitted Mean Charges");
-    MHCamera disp2 (geomcam, "SigmaCharge",       "Sigma of Fitted Charges");
-    MHCamera disp3 (geomcam, "RSigma",            "Reduced Sigmas");
-    MHCamera disp4 (geomcam, "RSigmaPerCharge",   "Reduced Sigma per Charge");
-    MHCamera disp5 (geomcam, "NumPhes",           "Nr. of Phe's (F-Factor Method)");
-    MHCamera disp6 (geomcam, "ConvFADC2Phes",     "Conversion Factor (F-Factor Method)");
-    MHCamera disp7 (geomcam, "TotalFFactor",      "Total F-Factor (F-Factor Method)");
-    MHCamera disp8 (geomcam, "CascadesQEFFactor", "Cascades QE (F-Factor Method)");
-    MHCamera disp9 (geomcam, "CascadesQEBlindPix","Cascades QE (Blind Pixel Method)");
-    MHCamera disp10(geomcam, "CascadesQEPINDiode","Cascades QE (PIN Diode Method)");
-    MHCamera disp11(geomcam, "CascadesQECombined","Cascades QE (Combined Method)");
-    MHCamera disp12(geomcam, "FFactorValid",      "Pixels with valid F-Factor calibration");
-    MHCamera disp13(geomcam, "BlindPixelValid",   "Pixels with valid BlindPixel calibration");
-    MHCamera disp14(geomcam, "PINdiodeValid",     "Pixels with valid PINDiode calibration");
-    MHCamera disp15(geomcam, "CombinedValid",     "Pixels with valid Combined calibration");
-    MHCamera disp16(geomcam, "Saturation",        "Pixels with saturated Hi Gain");
-    MHCamera disp17(geomcam, "ConversionMeans",   "Conversion HiGain.vs.LoGain Means");
-    MHCamera disp18(geomcam, "ConversionSigmas",  "Conversion HiGain.vs.LoGain Sigmas");
-    MHCamera disp19(geomcam, "HiGainPickup",      "Number Pickup events Hi Gain");
-    MHCamera disp20(geomcam, "LoGainPickup",      "Number Pickup events Lo Gain");
-    MHCamera disp21(geomcam, "HiGainBlackout",    "Number Blackout events Hi Gain");
-    MHCamera disp22(geomcam, "LoGainBlackout",    "Number Blackout events Lo Gain");
-    MHCamera disp23(geomcam, "Excluded",          "Pixels previously excluded");
-    MHCamera disp24(geomcam, "Bad;UnSuitable",        "Pixels not suited for further analysis");
-    MHCamera disp25(geomcam, "Bad;UnReliable",        "Pixels not reliable for further analysis");
-    MHCamera disp26(geomcam, "Bad;HiGainOscillating", "Oscillating Pixels High Gain");
-    MHCamera disp27(geomcam, "Bad;LoGainOscillating", "Oscillating Pixels Low Gain");
-    MHCamera disp28(geomcam, "Cal;AbsTimeMean",       "Abs. Arrival Times");
-    MHCamera disp29(geomcam, "Cal;AbsTimeRms",        "RMS of Arrival Times");
-    MHCamera disp30(geomcam, "time;MeanTime",         "Mean Rel. Arrival Times");
-    MHCamera disp31(geomcam, "time;SigmaTime",        "Sigma Rel. Arrival Times");
-    MHCamera disp32(geomcam, "time;TimeProb",         "Probability of Time Fit");
-    MHCamera disp33(geomcam, "time;NotFitValid",      "Pixels with not valid fit results");
-    MHCamera disp34(geomcam, "time;Oscillating",      "Oscillating Pixels");
-
-
-    
+    MHCamera disp1 (geomcam, Form("%s%s","Charge",(fRuns->GetRunsAsFileName()).Data()),
+                    "Fitted Mean Charges");
+    MHCamera disp2 (geomcam, Form("%s%s","SigmaCharge",(fRuns->GetRunsAsFileName()).Data()),
+                    "Sigma of Fitted Charges");
+    MHCamera disp3 (geomcam, Form("%s%s","RSigma",(fRuns->GetRunsAsFileName()).Data()),
+                    "Reduced Sigmas");
+    MHCamera disp4 (geomcam, Form("%s%s","RSigmaPerCharge",(fRuns->GetRunsAsFileName()).Data()),  
+                    "Reduced Sigma per Charge");
+    MHCamera disp5 (geomcam, Form("%s%s","NumPhes",(fRuns->GetRunsAsFileName()).Data()),
+                    "Nr. of Phe's (F-Factor Method)");
+    MHCamera disp6 (geomcam, Form("%s%s","ConvFADC2Phes",(fRuns->GetRunsAsFileName()).Data()),
+                    "Conversion Factor (F-Factor Method)");
+    MHCamera disp7 (geomcam, Form("%s%s","TotalFFactor",(fRuns->GetRunsAsFileName()).Data()),
+                    "Total F-Factor (F-Factor Method)");
+    MHCamera disp8 (geomcam, Form("%s%s","CascadesQEFFactor",(fRuns->GetRunsAsFileName()).Data()),
+                    "Cascades QE (F-Factor Method)");
+    MHCamera disp9 (geomcam, Form("%s%s","CascadesQEBlindPix",(fRuns->GetRunsAsFileName()).Data()),
+                    "Cascades QE (Blind Pixel Method)");
+    MHCamera disp10(geomcam, Form("%s%s","CascadesQEPINDiode",(fRuns->GetRunsAsFileName()).Data()),
+                    "Cascades QE (PIN Diode Method)");
+    MHCamera disp11(geomcam, Form("%s%s","CascadesQECombined",(fRuns->GetRunsAsFileName()).Data()),
+                    "Cascades QE (Combined Method)");
+    MHCamera disp12(geomcam, Form("%s%s","FFactorValid",(fRuns->GetRunsAsFileName()).Data()),
+                    "Pixels with valid F-Factor calibration");
+    MHCamera disp13(geomcam, Form("%s%s","BlindPixelValid",(fRuns->GetRunsAsFileName()).Data()), 
+                    "Pixels with valid BlindPixel calibration");
+    MHCamera disp14(geomcam, Form("%s%s","PINdiodeValid",(fRuns->GetRunsAsFileName()).Data()),
+                    "Pixels with valid PINDiode calibration");
+    MHCamera disp15(geomcam, Form("%s%s","CombinedValid",(fRuns->GetRunsAsFileName()).Data()),
+                    "Pixels with valid Combined calibration");
+    MHCamera disp16(geomcam, Form("%s%s","Saturation",(fRuns->GetRunsAsFileName()).Data()),
+                    "Pixels with saturated Hi Gain");
+    MHCamera disp17(geomcam, Form("%s%s","ConversionMeans",(fRuns->GetRunsAsFileName()).Data()), 
+                    "Conversion HiGain.vs.LoGain Means");
+    MHCamera disp18(geomcam, Form("%s%s","ConversionSigmas",(fRuns->GetRunsAsFileName()).Data()), 
+                    "Conversion HiGain.vs.LoGain Sigmas");
+    MHCamera disp19(geomcam, Form("%s%s","HiGainPickup",(fRuns->GetRunsAsFileName()).Data()),
+                    "Number Pickup events Hi Gain");
+    MHCamera disp20(geomcam, Form("%s%s","LoGainPickup",(fRuns->GetRunsAsFileName()).Data()),
+                    "Number Pickup events Lo Gain");
+    MHCamera disp21(geomcam, Form("%s%s","HiGainBlackout",(fRuns->GetRunsAsFileName()).Data()),
+                    "Number Blackout events Hi Gain");
+    MHCamera disp22(geomcam, Form("%s%s","LoGainBlackout",(fRuns->GetRunsAsFileName()).Data()), 
+                    "Number Blackout events Lo Gain");
+    MHCamera disp23(geomcam, Form("%s%s","Excluded",(fRuns->GetRunsAsFileName()).Data()),
+                    "Pixels previously excluded");
+    MHCamera disp24(geomcam, Form("%s%s","UnSuitable",(fRuns->GetRunsAsFileName()).Data()),
+                    "Pixels not suited for further analysis");
+    MHCamera disp25(geomcam, Form("%s%s","UnReliable",(fRuns->GetRunsAsFileName()).Data()),
+                    "Pixels not reliable for further analysis");
+    MHCamera disp26(geomcam, Form("%s%s","HiGainOscillating",(fRuns->GetRunsAsFileName()).Data()),
+                    "Oscillating Pixels High Gain");
+    MHCamera disp27(geomcam, Form("%s%s","LoGainOscillating",(fRuns->GetRunsAsFileName()).Data()),
+                    "Oscillating Pixels Low Gain");
+    MHCamera disp28(geomcam, Form("%s%s","AbsTimeMean",(fRuns->GetRunsAsFileName()).Data()),
+                    "Abs. Arrival Times");
+    MHCamera disp29(geomcam, Form("%s%s","AbsTimeRms",(fRuns->GetRunsAsFileName()).Data()),
+                    "RMS of Arrival Times");
+    MHCamera disp30(geomcam, Form("%s%s","MeanTime",(fRuns->GetRunsAsFileName()).Data()),
+                    "Mean Rel. Arrival Times");
+    MHCamera disp31(geomcam, Form("%s%s","SigmaTime",(fRuns->GetRunsAsFileName()).Data()),
+                    "Sigma Rel. Arrival Times");
+    MHCamera disp32(geomcam, Form("%s%s","TimeProb",(fRuns->GetRunsAsFileName()).Data()),
+                    "Probability of Time Fit");
+    MHCamera disp33(geomcam, Form("%s%s","TimeNotFitValid",(fRuns->GetRunsAsFileName()).Data()),
+                    "Pixels with not valid fit results");
+    MHCamera disp34(geomcam, Form("%s%s","TimeOscillating",(fRuns->GetRunsAsFileName()).Data()),
+                    "Oscillating Pixels");
+
     // Fitted charge means and sigmas
     disp1.SetCamContent(fCalibrationCam,  0);
@@ -498 +529 @@
     if (fDisplayType == kFullDisplay)
       {
+
+        MHCalibrationChargeBlindPix *blind = (MHCalibrationChargeBlindPix*)plist.FindObject("MHCalibrationChargeBlindPix");
+        blind->DrawClone();
+        gPad->GetCanvas()->SaveAs(Form("%s%s%s",blind->GetName(),(fRuns->GetRunsAsString()).Data(),".root"));
+        
+        MHCalibrationChargeCam *cam = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
+        cam->DrawClone();
+        gPad->GetCanvas()->SaveAs(Form("%s%s%s",cam->GetName(),(fRuns->GetRunsAsString()).Data(),".root"));
+        
+        MHCalibrationRelTimeCam *rel = (MHCalibrationRelTimeCam*)plist.FindObject("MHCalibrationRelTimeCam");
+        rel->DrawClone();
+        gPad->GetCanvas()->SaveAs(Form("%s%s%s",rel->GetName(),(fRuns->GetRunsAsString()).Data(),".root"));
 
         MHCalibrationCam *cam = (MHCalibrationCam*)plist.FindObject("MHCalibrationChargeCam");
@@ -841 +884 @@
   MExtractSlidingWindow    extract2;
   MExtractTimeSpline       timespline;
-  MArrivalTimeCalc         arrcalc;
   MCalibrationChargeCalc   calcalc;
   MCalibrationRelTimeCalc  timecalc;
@@ -877 +919 @@
       *fLog << warn << GetDescriptor() 
             << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl;
-      //      tlist.AddToList(&extract2);
-      tlist.AddToList(&arrcalc);
+      tlist.AddToList(&extract2);
     }