Changeset 3323 for trunk/MagicSoft

Timestamp:

02/26/04 07:00:22 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/calibration.C (modified) (3 diffs)
• mcalib/MHCalibrationChargeBlindPix.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/macros/calibration.C

@@ -52 +52 @@
     if (!pedloop.Process())
         return;
+
+    // 
+    // Now the short version: 
+    //
+/*
+    MJCalibration calloop;
+    calloop.SetInput(&cruns);
+    calloop.SetDisplay(display);
+    if (!calloop.Process(pedloop.GetPedestalCam()))
+        return;
+#if 0
+*/
+    // 
+    // The longer version:
+    //
 
     //
@@ -434 +449 @@
     CamDraw(c12,disp34,calcam,2,2,2);
 
+#endif
 }
 
@@ -547 +563 @@
     }
 }
+
+

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc

@@ -846 +846 @@
   fHPedestalFADCSlices = new TH1F(fAPedestalFADCSlices);
   fHPedestalFADCSlices->SetName("PedestalFADCSlices");
-  fHPedestalFADCSlices->SetTitle(Form("%s%f","Pedestal FADC Slices, Sum > ",fSinglePheCut));
+  fHPedestalFADCSlices->SetTitle(Form("%s%f","Pedestal FADC Slices, Sum < ",fSinglePheCut));
   fHPedestalFADCSlices->SetXTitle("FADC slice number");
   fHPedestalFADCSlices->SetYTitle("FADC counts");

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -506 +506 @@
     MCalibrationChargeCalc   calcalc;
 
-    MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
-    MFillH fillblind("MHCalibrationChargeBlindPix", "MExtractedSignalBlindPixel");
+    MFillH fillpin(  "MHCalibrationChargePINDiode" , "MExtractedSignalPINDiode"   );
+    MFillH fillblind("MHCalibrationChargeBlindPix" , "MExtractedSignalBlindPixel" );
+    MFillH fillcam  ("MHCalibrationChargeCam"      , "MExtractedSignalCam"        );
     // 
     // Apply a filter against cosmics
@@ -525 +526 @@
     tlist.AddToList(&blindext);
     tlist.AddToList(&cont);
+    tlist.AddToList(&fillcam);
     tlist.AddToList(&fillpin);
     tlist.AddToList(&fillblind);