Changeset 8018


Ignore:
Timestamp:
10/08/06 13:37:07 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r8017 r8018  
    2828   * ganymed.rc, ganymed:onoff.rc, ganymed_wobble.rc:
    2929     - some further update
     30
     31   * mcalib/MCalibrationHiLoCam.[h,cc]:
     32     - broke down a long Form() chain into single Form()'s
    3033
    3134
  • trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.cc

    r5946 r8018  
    115115}
    116116
     117void MCalibrationHiLoCam::PrintPix(const MCalibrationHiLoPix &pix, const char *type) const
     118{
     119    *fLog << all << setw(7) << type << Form("%4i", pix.GetPixId()) << ":   ";
     120    *fLog << "   Ratio: " << Form("%4.2f", pix.GetHiLoChargeRatio());
     121    *fLog << " +- " << Form("%4.2f", pix.GetHiLoChargeRatioErr());
     122    *fLog << "   Sigma: " << Form("%4.2f", pix.GetHiLoChargeRatioSigma());
     123    *fLog << " +- " << Form("%4.2f", pix.GetHiLoChargeRatioSigmaErr());
     124    *fLog << endl;
     125}
     126
    117127// --------------------------------------------------------------------------
    118128//
     
    132142  MCalibrationHiLoPix *pix;
    133143  while ((pix=(MCalibrationHiLoPix*)Next()))
    134     {
    135      
    136       if (!pix->IsExcluded())
    137         {                           
    138 
    139           *fLog << all
    140                 << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Pix  ",pix->GetPixId(),
    141                         ":            Ratio: ",pix->GetHiLoChargeRatio()," +- ",pix->GetHiLoChargeRatioErr(),
    142                         "   Sigma: ",pix->GetHiLoChargeRatioSigma()," +- ",pix->GetHiLoChargeRatioSigmaErr())
    143                 << endl;
     144      if (!pix->IsExcluded())
     145      {
     146          PrintPix(*pix, "Pixel");
    144147          id++;
    145         }
    146     }
     148      }
    147149 
    148150  *fLog << all << id << " pixels" << endl;
     
    170172  TIter Next5(fAverageAreas);
    171173  while ((pix=(MCalibrationHiLoPix*)Next5()))
    172   {
    173     *fLog << all
    174           << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Area   ",pix->GetPixId(),
    175                   ":  Ratio: ",pix->GetHiLoChargeRatio()," +- ",pix->GetHiLoChargeRatioErr(),
    176                   "   Sigma: ",pix->GetHiLoChargeRatioSigma()," +- ",pix->GetHiLoChargeRatioSigmaErr())
    177           << endl;
    178   }
     174      PrintPix(*pix, "Area");
    179175
    180176  TIter Next6(fAverageSectors);
    181177  while ((pix=(MCalibrationHiLoPix*)Next5()))
    182   {
    183     *fLog << all
    184           << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Sector ",pix->GetPixId(),
    185                   ":  Ratio: ",pix->GetHiLoChargeRatio()," +- ",pix->GetHiLoChargeRatioErr(),
    186                   "   Sigma: ",pix->GetHiLoChargeRatioSigma()," +- ",pix->GetHiLoChargeRatioSigmaErr())
    187           << endl;
    188   }
     178      PrintPix(*pix, "Sector");
    189179}
    190180
  • trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.h

    r7147 r8018  
    55#include "MCalibrationCam.h"
    66#endif
     7
     8class MCalibrationHiLoPix;
    79
    810class MCalibrationHiLoCam : public MCalibrationCam
     
    1315  void AddArea(const UInt_t a, const UInt_t b);
    1416  void AddSector(const UInt_t a, const UInt_t b);
     17
     18  void PrintPix(const MCalibrationHiLoPix &pix, const char *type) const;
    1519
    1620public:
Note: See TracChangeset for help on using the changeset viewer.