Changeset 5866 for trunk/MagicSoft/Mars

Timestamp:

01/16/05 22:20:02 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mcalib/MCalibrationIntensityChargeCam.cc (modified) (1 diff)
• mcalib/MCalibrationIntensityChargeCam.h (modified) (1 diff)
• mjobs/MJCalibrateSignalFromOutside.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc

@@ -821 +821 @@
 // -------------------------------------------------------------------
 //
+// Returns a TGraphErrors with the mean effective number of photon
+// vs. the calibration camera number. With the string 'method', different
+// calibration methods can be called.
+//
+TGraphErrors *MCalibrationIntensityChargeCam::GetPhotVsTime( const Option_t *method )
+{
+  
+  const Int_t size = GetSize();
+  
+  if (size == 0)
+    return NULL;
+
+  TString option(method);
+
+  TArrayF photarr(size);
+  TArrayF photarrerr(size);
+  TArrayF nr(size);
+  TArrayF nrerr(size);
+  
+  for (Int_t i=0;i<GetSize();i++)
+    {
+      //
+      // Get the calibration cam from the intensity cam
+      //
+      MCalibrationChargeCam *cam = (MCalibrationChargeCam*)GetCam(i);
+
+      //
+      // Get the calibration pix from the calibration cam
+      //
+      Float_t phot    = 0.;
+      Float_t photerr = 0.;
+
+      if (option.Contains("BlindPixel"))
+        {
+          phot    = cam->GetNumPhotonsBlindPixelMethod();
+          photerr = cam->GetNumPhotonsBlindPixelMethodErr();
+        }
+      if (option.Contains("FFactor"))
+        {
+          phot    = cam->GetNumPhotonsFFactorMethod();
+          photerr = cam->GetNumPhotonsFFactorMethodErr();
+        }
+      if (option.Contains("PINDiode"))
+        {
+          phot    = cam->GetNumPhotonsPINDiodeMethod();
+          photerr = cam->GetNumPhotonsPINDiodeMethodErr();
+        }
+
+      photarr[i]       = phot;
+      photarrerr[i]    = photerr;
+
+      nr[i] = i;
+      nrerr[i] = 0.;
+    }
+  
+  TGraphErrors *gr = new TGraphErrors(size,
+                                     nr.GetArray(),photarr.GetArray(),
+                                     nrerr.GetArray(),photarrerr.GetArray());
+  gr->SetTitle("Photons Average");
+  gr->GetXaxis()->SetTitle("Camera Nr.");
+  gr->GetYaxis()->SetTitle("<N_phot> [1]");      
+  return gr;
+}
+
+// -------------------------------------------------------------------
+//
 // Returns a TGraphErrors with the mean effective number of photo-electrons per 
 // area index 'aidx' vs. the calibration camera number 

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.h

@@ -37 +37 @@
   TH2F         *GetRazmikPlotResults( const Int_t aidx, const MGeomCam &geom );
 
+  TGraphErrors *GetChargePerAreaVsTime( const Int_t aidx, const MGeomCam &geom );  
   TGraphErrors *GetPhePerAreaVsTime( const Int_t aidx, const MGeomCam &geom );
-  TGraphErrors *GetChargePerAreaVsTime( const Int_t aidx, const MGeomCam &geom );
+  TGraphErrors *GetPhotVsTime( const Option_t *method="FFactor" );
+
   TGraphErrors *GetVarPerAreaVsTime( const Int_t aidx, const MGeomCam &geom, const Option_t *opt );
-
   TGraphErrors *GetVarVsTime( const Int_t pixid , const Option_t *opt );
   

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignalFromOutside.cc

@@ -331 +331 @@
     MBadPixelsTreat        treat;
 
+    bpcal.SetNamePedPhotCam("MPedPhotFromExtractor");
+    treat.AddNamePedPhotCam("MPedPhotFundamental");
+    treat.AddNamePedPhotCam("MPedPhotFromExtractor");
+    treat.AddNamePedPhotCam("MPedPhotFromExtractorRndm");
+
     MHCamEvent evt0(0, "PedFLG",      "Pedestal from Lo Gain;;P [fadc/sl]");
     MHCamEvent evt1(2, "PedRmsFLG",   "Pedestal RMS from Lo Gain;;\\sigma_{p} [fadc/sl]");
@@ -336 +341 @@
     MHCamEvent evt3(0, "PedPhot",     "Calibrated Pedestal;;P [\\gamma]");
     MHCamEvent evt4(1, "PedRMS",      "Calibrated Pedestal RMS;;\\sigma_{p} [\\gamma]");
-    MHCamEvent evt5(0, "Interp'd",    "Interpolated Signal;;S [\\gamma]");
+    MHCamEvent evt5(3, "Interp'd",    "Interpolated Signal;;S [\\gamma]");
     MHCamEvent evt6(2, "Unsuitable",  "Unsuitable event ratio;;%");
     MHCamEvent evt7(0, "Times",       "Arrival Time;;T [slice]");