Changeset 3084 for trunk/MagicSoft/Mars/macros

Timestamp:

02/10/04 22:45:23 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/macros/calibration.C (modified) (8 diffs)

trunk/MagicSoft/Mars/macros/calibration.C

@@ -219 +219 @@
     MArrivalTimeCalc     timecalc;
     MCalibrationCalc     calcalc;
+    
+    // 
+    // Apply a filter against cosmics
+    // (was directly in MCalibrationCalc in earlier versions)
+    //
+    MFCosmics            cosmics;
+    MContinue            cont(&cosmics);
 
     //
@@ -241 +248 @@
     // (This is a preliminary feature)
     //
-    //calcalc.ExcludePixelsFromAsciiFile("badpixels_all.dat");
+   calcalc.ExcludePixelsFromAsciiFile("badpixels.dat");
     
     //
@@ -248 +255 @@
     //
     // calcalc.SkipBlindPixelFit();
-
-    //
-    // In case, you want to skip the cosmics rejection
-    // (NOT RECOMMENDED!!!)
-    //
-    // calcalc.SkipCosmicsRejection();
 
     //
@@ -276 +277 @@
     //
     //    tlist2.AddToList(&timecalc);
+    tlist2.AddToList(&cont);
     tlist2.AddToList(&calcalc);
 
@@ -301 +303 @@
     // just one example how to get the plots of individual pixels
     //
-    calcam[356].DrawClone();
+    calcam[543].DrawClone();
 
     // Create histograms to display
@@ -312 +314 @@
     MHCamera disp7  (geomcam, "Cal;FFactorConv",    "Conversion Factor (F-Factor Method)");
     MHCamera disp8  (geomcam, "Cal;FFactorFFactor", "Total F-Factor (F-Factor Method)");
-    MHCamera disp9  (geomcam, "Cal;BlindPixPh",     "Nr. of Photons inside plexiglass (Blind Pixel Method)");
+    MHCamera disp9  (geomcam, "Cal;BlindPixPh",     "Photon flux inside plexiglass (Blind Pixel Method)");
     MHCamera disp10 (geomcam, "Cal;BlindPixConv",   "Conversion Factor (Blind Pixel Method)");
     MHCamera disp11 (geomcam, "Cal;BlindPixFFactor","Total F-Factor (Blind Pixel Method)");
-    MHCamera disp12 (geomcam, "Cal;PINDiodePh",     "Nr. of Photons outside plexiglass (PIN Diode Method)");
+    MHCamera disp12 (geomcam, "Cal;PINDiodePh",     "Photon flux outside plexiglass (PIN Diode Method)");
     MHCamera disp13 (geomcam, "Cal;PINDiodeConv",   "Conversion Factor (PIN Diode Method)");
     MHCamera disp14 (geomcam, "Cal;PINDiodeFFactor","Total F-Factor (PIN Diode Method)");
@@ -416 +418 @@
     disp8.SetYTitle("\\sqrt{N_{PhE}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
 
-    disp9.SetYTitle("Nr. Photons [1]");
+    disp9.SetYTitle("Photon flux [ph/mm^2]");
     disp10.SetYTitle("Conversion Factor [Phot/FADC Count]");
     disp11.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
 
-    disp12.SetYTitle("Nr. Photons [1]");
+    disp12.SetYTitle("Photon flux [ph/mm^2]");
     disp13.SetYTitle("Conversion Factor [Phot/FADC Count]");
     disp14.SetYTitle("\\sqrt{N_{Ph}}*\\sigma_{Charge}/\\mu_{Charge} [1]");
@@ -465 +467 @@
     // F-Factor Method
     TCanvas &c4 = display->AddTab("F-Factor");
-    c4.Divide(3,3);
-
-    CamDraw(c4, disp6,calcam,1, 3 , 2);
-    CamDraw(c4, disp7,calcam,2, 3 , 2);
-    CamDraw(c4, disp8,calcam,3, 3 , 2);
+    c4.Divide(2,3);
+
+    CamDraw(c4, disp6,calcam,1, 2 , 2);
+    CamDraw(c4, disp7,calcam,2, 2 , 2);
+    //    CamDraw(c4, disp8,calcam,3, 3 , 2);
 
     // Blind Pixel Method