Changeset 8446

Timestamp:

04/25/07 15:39:43 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbadpixels/MBadPixelsCam.cc (modified) (10 diffs)
• mhcalib/MHCalibrationChargeCam.cc (modified) (2 diffs)
• mhcalib/MHCalibrationPulseTimeCam.cc (modified) (4 diffs)
• mjobs/MJPedestal.cc (modified) (1 diff)
• mpedestal/MPedestalSubtractedEvt.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/04/25 Thomas Bretz
+
+   * mbadpixels/MBadPixelsCam.cc:
+     - removed obsolete code from Print() which tried to align the output
+
+   * mhcalib/MHCalibrationChargeCam.cc:
+     - increased the shown binning range further
+
+   * mhcalib/MHCalibrationPulseTimeCam.cc:
+     - unimportant changes
+
+   * mjobs/MJPedestal.cc:
+     - changed a comment
+
+   * mpedestal/MPedestalSubtractedEvt.h:
+     - fixed a bug of preset upper limits. The last slice is fNumSamples-1
+       not fNumSamples
+
+
+
  2007/04/24 Thomas Bretz
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.49 2007-04-20 08:55:17 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.50 2007-04-25 14:39:41 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -394 +394 @@
     
   Int_t count = 0;
-  Int_t full  = 0;
 
   for (Int_t i=0; i<GetSize(); i++)
@@ -401 +400 @@
         {
           *fLog << i << " ";
-          full++;
           count ++;
         }
-      
-      if (count == 0)
-        continue;
-      
-      if (!(full % 25))
-        {
-          full = 0;
-          *fLog << endl;
-        }
-    }
-  *fLog << endl;
+    }
   *fLog << count << " normal pixels" << endl;
   *fLog << endl;
 
   *fLog << "Pixels unsuited for the whole run:" << endl;
-  
-  full  = 0;
+
   count = 0;
   for (Int_t i=0; i<GetSize(); i++)
@@ -427 +414 @@
         {
           *fLog << i << " ";
-          full++;
           count ++;
         }
-      
-      if (count == 0)
-        continue;
-      
-      if (!(full % 25))
-        {
-          full = 0;
-          *fLog << endl;
-        }
-    }
-
-  *fLog << endl;
+    }
+
   *fLog << count << " unsuited pixels per run :-(" << endl;
   *fLog << endl;
-  
+
   *fLog << "Pixels unsuited for this event:" << endl;
 
-  full  = 0;
   count = 0;
   for (Int_t i=0; i<GetSize(); i++)
@@ -454 +429 @@
         {
           *fLog << i << " ";
-          full++;
           count ++;
         }
-      
-      if (count == 0)
-        continue;
-      
-      if (!(full % 25))
-        {
-          full  = 0;
-          *fLog << endl;
-        }
-    }
-
-  *fLog << endl;
+    }
+
   *fLog << count << " unsuited pixels per event :-(" << endl;
   *fLog << endl;
-  
-  full  = 0;
+
   count = 0;
-  
+
   *fLog << all << "Pixels unreliable for the whole run:" << endl;
-  
+
   for (Int_t i=0; i<GetSize(); i++)
     {
@@ -482 +445 @@
         {
           *fLog << i << " ";
-          full++;
           count ++;
         }
-      
-      if (count == 0)
-        continue;
-      
-      if (!(full % 25))
-        {
-          full  = 0;
-          *fLog << endl;
-        }
-    }
-  
-  *fLog << endl;
+    }
+
   *fLog << count << " unreliable pixels :-(" << endl;
   *fLog << endl;
@@ -502 +454 @@
   *fLog << all << "Unsuited pixels statistics:" << endl;
   *fLog << endl;
-  
+
   PrintBadPixels(MBadPixelsPix::kPreviouslyExcluded,"Previously excluded");
   PrintBadPixels(MBadPixelsPix::kChargeIsPedestal,"Signal smaller 3 Pedestal RMS");
@@ -519 +471 @@
   *fLog << all << "Unreliable pixels statistics:" << endl;
   *fLog << endl;
-  
+
   PrintBadPixels(MBadPixelsPix::kChargeSigmaNotValid,"Signal Sigma smaller Pedestal RMS");
   PrintBadPixels(MBadPixelsPix::kHiGainNotFitted    ,"High Gain Signals could not be fitted");
@@ -554 +506 @@
   *fLog << "Pixels with " << text << ": " << endl;
   UInt_t count = 0;
-  UInt_t full  = 0;
 
   for (Int_t i=0; i<GetSize(); i++)
@@ -561 +512 @@
         {
           *fLog << i << " ";
-          full++;
           count++;
         }
-      
-      if (count == 0)
-        continue;
-      
-      if (!(full % 25))
-        {
-          full  = 0;
-          *fLog << endl;
-        }
     }
   
-  *fLog << endl;
   *fLog << Form("%3i",count) << " pixels in total " << endl;
 }

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.56 2007-04-18 15:33:56 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.57 2007-04-25 14:39:43 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1274 +1274 @@
     xaxe->SetTitle(hist->GetXaxis()->GetTitle());
     yaxe->SetTitle(hist->GetYaxis()->GetTitle());
-    xaxe->SetRange(hist->GetMaximumBin()-30, hist->GetMaximumBin()+30);
+    xaxe->SetRange(hist->GetMaximumBin()-50, hist->GetMaximumBin()+50);
 
     gStyle->SetOptFit();

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.37 2007-04-23 19:06:28 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.38 2007-04-25 14:39:43 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -390 +390 @@
 
         // Get position of maximum
-        const Int_t   pos = evt->GetMax(idx/*, first, last*/);
+        const Int_t   pos = evt->GetMax(idx);
         const Float_t max = evt->GetSamples(idx)[pos];
 
@@ -413 +413 @@
     for (UInt_t j=0; j<nareas; j++)
     {
-        const Int_t npix = fAverageAreaNum[j];
-
-        if (npix > fNumPixelsRequired)
+        if (fAverageAreaNum[j] > fNumPixelsRequired)
         {
+            sumarea[j] /= fAverageAreaNum[j];
+
             if (IsOscillations())
-                GetAverageHiGainArea(j).FillHistAndArray(sumarea[j]/npix);
+                GetAverageHiGainArea(j).FillHistAndArray(sumarea[j]);
             else
-                GetAverageHiGainArea(j).FillHist(sumarea[j]/npix);
+                GetAverageHiGainArea(j).FillHist(sumarea[j]);
 
         }
@@ -427 +427 @@
     for (UInt_t j=0; j<nsectors; j++)
     {
-        const Int_t npix = fAverageSectorNum[j];
-
-        if (npix > 0)
+        if (fAverageSectorNum[j] > 0)
         {
+            sumsector[j] /= fAverageSectorNum[j];
+
             if (IsOscillations())
-                GetAverageHiGainSector(j).FillHistAndArray(sumsector[j]/npix);
+                GetAverageHiGainSector(j).FillHistAndArray(sumsector[j]);
             else
-                GetAverageHiGainSector(j).FillHist(sumsector[j]/npix);
+                GetAverageHiGainSector(j).FillHist(sumsector[j]);
         }
     }

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -1070 +1070 @@
         hpedcam.SetRenorm(kTRUE);
 
-    // To have it in the parlist!
+    // To have it in the parlist for MEnv!
     MHCalibrationPulseTimeCam pulcam;
     plist.AddToList(&pulcam);

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtractedEvt.h

@@ -49 +49 @@
     Int_t GetMax(const Int_t pixidx, UInt_t &val) const
     {
-        return GetMax(pixidx, 0, fNumSamples, val);
+        return GetMax(pixidx, 0, fNumSamples-1, val);
     }
 
@@ -55 +55 @@
     {
         UInt_t val;
-        return GetMax(pixidx, 0, fNumSamples, val);
+        return GetMax(pixidx, 0, fNumSamples-1, val);
     }
     Int_t GetSaturation(const Int_t pixidx, Int_t limit) const
     {
         Int_t first=0;
-        Int_t last=fNumSamples;
+        Int_t last=fNumSamples-1;
         return GetSaturation(pixidx, limit, first, last);
     }