Changeset 2631 for trunk/MagicSoft

Timestamp:

12/10/03 11:54:33 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/calibration.C (modified) (6 diffs)
• manalysis/MCalibrationCalc.cc (modified) (2 diffs)
• manalysis/MCalibrationCam.cc (modified) (1 diff)
• manalysis/MCalibrationPix.cc (modified) (2 diffs)
• manalysis/MCalibrationPix.h (modified) (1 diff)
• manalysis/MExtractSignal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/macros/calibration.C

@@ -174 +174 @@
     MHCamera disp14  (geomcam, "MCalibrationCam;photons", "Nr. of Photons (Blind Pixel Method)");
     MHCamera disp15  (geomcam, "MCalibrationCam;convphot", "Conversion Factor (Blind Pixel Method)");
+    MHCamera disp16  (geomcam, "MCalibrationCam;sigma/charge", "Sigma per Charge");
 
     disp1.SetCamContent(*cam, 0);
@@ -199 +200 @@
     disp14.SetCamContent(*cam, 13);
     disp15.SetCamContent(*cam, 14);
-    //    disp16.SetCamError(*cam, 16);
+    disp16.SetCamContent(*cam, 15);
 
 
@@ -217 +218 @@
     disp14.SetYTitle("Nr Photons");
     disp15.SetYTitle("Conversion Factor [Ph/FADC count]");
+    disp16.SetYTitle("Sigma per Charge [1]");
 
     disp1.SetPrettyPalette();
@@ -231 +233 @@
     disp14.SetPrettyPalette();
     disp15.SetPrettyPalette();
+    disp16.SetPrettyPalette();
 
 
@@ -322 +325 @@
 
     TCanvas *c4 = &d2->AddTab("Reduced Charges");
-    c4->Divide(2,1);
+    c4->Divide(2,2);
 
     c4->cd(1);
@@ -330 +333 @@
 
     c4->cd(3);
+    obj->Draw();
+
+    c4->cd(2);
+    gStyle->SetOptStat(1111);
+    obj=disp16.DrawCopy("hist");
+    ((MHCamera*)obj)->AddNotify(*cam);
+
+    c4->cd(4);
     obj->Draw();
 

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc

@@ -313 +313 @@
         else
             mid  = pixel.GetIdxMaxHiGainSample();
-
 
         MCalibrationPix &pix = (*fCalibrations)[pixid];
@@ -391 +390 @@
 {
 
+
   *fLog << inf << endl;
   *fLog << GetDescriptor() << " Cut Histogram Edges" << endl;

trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc

@@ -439 +439 @@
       val = (*this)[idx].GetRSigma();
       break;
+    case 15:
+      val = (*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge();
+      break;
     case 11:
       val = (*this)[idx].GetPheFFactorMethod();

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc

@@ -60 +60 @@
       fPheFFactorMethod(-1.),
       fConversionFFactorMethod(-1.),
-      fHiGainSaturation(kFALSE)
+      fHiGainSaturation(kFALSE),
+      fLoGainPedRms(4.)
 {
 
@@ -137 +138 @@
   if ((fPed > 0.)  && (fPedRms > 0.))
     {
-      
-    fRSigma       = (fSigmaCharge*fSigmaCharge) - (fPedRms*fPedRms);
+
+      if (fHiGainSaturation)
+        fRSigma = (fSigmaCharge*fSigmaCharge) - (fLoGainPedRms*fLoGainPedRms);
+      else
+        fRSigma = (fSigmaCharge*fSigmaCharge) - (fPedRms*fPedRms);
 
     if (fRSigma > 0. )

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h

@@ -33 +33 @@
 
   Bool_t fHiGainSaturation;     // Is Lo-Gain used at all?
+
+  Float_t fLoGainPedRms;
 
   MHCalibrationPixel *fHist;    //! Pointer to the histograms performing the fits, etc.  

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -57 +57 @@
 //
 MExtractSignal::MExtractSignal(const char *name, const char *title)
-  : fSaturationLimit(250),
+  : fSaturationLimit(255),
     fConversionHiLo(10.)
 {
@@ -173 +173 @@
         UInt_t max  = pixel.GetMaxHiGainSample();
 
-        if (max < fSaturationLimit)  // take Hi Gain, no saturation
+        if (max <= fSaturationLimit)  // take Hi Gain, no saturation
           {
             sum = (float)pixel.GetSumHiGainSamples() - pedes*fNumHiGainSamples;