Changeset 3560


Ignore:
Timestamp:
03/19/04 23:02:47 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3558 r3560  
    4747     - added MCalibrationQECam
    4848     - cleaned the code up a little
     49     - give more information at the end
    4950
    5051   * mcalib/MCalibrationChargePix.[h,cc]
    … …  
    6061     - remove warning about pixel with low gain saturation,
    6162       now in MBadPixelsPix
     63
     64   * mbadpixels/MBadPixelsPix.[h,cc]
     65   * mcalib/MCalibrationChargeCam.cc
     66     - added new flag: kDeviatingNumPhes
     67
     68   * mcalib/MCalibrationChargePix.cc
     69     - check for mean arr. time in last bin replaced by check in last two bins
     70
     71   * mcalib/MCalibrationChargePix.[h,cc]
     72   * mcalib/MCalibrationChargeCam.cc
     73     - removed flag kHiGainFitted, kLoGainFitted, since they are available
     74       from MBadPixelsPix
    6275
    6376

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

    r3559 r3560  
    8383//
    8484// 26: Excluded Pixels
    85 // 27: Pixels where the fit did not succeed --> results obtained only from the histograms
    86 // 28: Number of probable pickup events in the Hi Gain
    87 // 29: Number of probable pickup events in the Lo Gain
     85// 27: Number of probable pickup events in the Hi Gain
     86// 28: Number of probable pickup events in the Lo Gain
    8887//
    8988// Other classifications of pixels:
    9089// ================================
    9190//
    92 // 30: Pixels with saturated Hi-Gain
     91// 29: Pixels with saturated Hi-Gain
    9392//
    9493// Used Pedestals:
    9594// ===============
    9695//
    97 // 31: Mean Pedestal over the entire range of signal extraction
    98 // 32: Error on the Mean Pedestal over the entire range of signal extraction
    99 // 33: Pedestal RMS over the entire range of signal extraction
    100 // 34: Error on the Pedestal RMS over the entire range of signal extraction
     96// 30: Mean Pedestal over the entire range of signal extraction
     97// 31: Error on the Mean Pedestal over the entire range of signal extraction
     98// 32: Pedestal RMS over the entire range of signal extraction
     99// 33: Error on the Pedestal RMS over the entire range of signal extraction
    101100//
    102101// Calculated absolute arrival times (very low precision!):
    103102// ========================================================
    104103//
    105 // 35: Absolute Arrival time of the signal
    106 // 36: RMS of the Absolute Arrival time of the signal
     104// 34: Absolute Arrival time of the signal
     105// 35: RMS of the Absolute Arrival time of the signal
    107106//
    108107/////////////////////////////////////////////////////////////////////////////
    … …  
    447446//
    448447// 26: Excluded Pixels
    449 // 27: Pixels where the fit did not succeed --> results obtained only from the histograms
    450 // 28: Number of probable pickup events in the Hi Gain
    451 // 29: Number of probable pickup events in the Lo Gain
     448// 27: Number of probable pickup events in the Hi Gain
     449// 28: Number of probable pickup events in the Lo Gain
    452450//
    453451// Other classifications of pixels:
    454452// ================================
    455453//
    456 // 30: Pixels with saturated Hi-Gain
     454// 29: Pixels with saturated Hi-Gain
    457455//
    458456// Used Pedestals:
    459457// ===============
    460458//
    461 // 31: Mean Pedestal over the entire range of signal extraction
    462 // 32: Error on the Mean Pedestal over the entire range of signal extraction
    463 // 33: Pedestal RMS over the entire range of signal extraction
    464 // 34: Error on the Pedestal RMS over the entire range of signal extraction
     459// 30: Mean Pedestal over the entire range of signal extraction
     460// 31: Error on the Mean Pedestal over the entire range of signal extraction
     461// 32: Pedestal RMS over the entire range of signal extraction
     462// 33: Error on the Pedestal RMS over the entire range of signal extraction
    465463//
    466464// Calculated absolute arrival times (very low precision!):
    467465// ========================================================
    468466//
    469 // 35: Absolute Arrival time of the signal
    470 // 36: RMS of the Absolute Arrival time of the signal
     467// 34: Absolute Arrival time of the signal
     468// 35: RMS of the Absolute Arrival time of the signal
    471469//
    472470Bool_t MCalibrationChargeCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
    … …  
    656654      if ((*this)[idx].IsExcluded())
    657655        return kFALSE;
    658       if (!(*this)[idx].IsFitted())
    659         val = 1;
    660       else
    661         return kFALSE;
     656      val = (*this)[idx].GetHiGainNumPickup();
    662657      break;
    663658    case 28:
    664659      if ((*this)[idx].IsExcluded())
    665660        return kFALSE;
    666       val = (*this)[idx].GetHiGainNumPickup();
     661      val = (*this)[idx].GetLoGainNumPickup();
    667662      break;
    668663    case 29:
    669664      if ((*this)[idx].IsExcluded())
    670665        return kFALSE;
    671       val = (*this)[idx].GetLoGainNumPickup();
     666      val = (*this)[idx].IsHiGainSaturation();
    672667      break;
    673668    case 30:
    674669      if ((*this)[idx].IsExcluded())
    675670        return kFALSE;
    676       val = (*this)[idx].IsHiGainSaturation();
     671      val = (*this)[idx].GetPed();
    677672      break;
    678673    case 31:
    679674      if ((*this)[idx].IsExcluded())
    680675        return kFALSE;
    681       val = (*this)[idx].GetPed();
     676      val = (*this)[idx].GetPedErr();
    682677      break;
    683678    case 32:
    684679      if ((*this)[idx].IsExcluded())
    685680        return kFALSE;
    686       val = (*this)[idx].GetPedErr();
     681      val = (*this)[idx].GetPedRms();
    687682      break;
    688683    case 33:
    689684      if ((*this)[idx].IsExcluded())
    690685        return kFALSE;
    691       val = (*this)[idx].GetPedRms();
     686      val = (*this)[idx].GetPedErr()/2.;
    692687      break;
    693688    case 34:
    694689      if ((*this)[idx].IsExcluded())
    695690        return kFALSE;
    696       val = (*this)[idx].GetPedErr()/2.;
     691      val = (*this)[idx].GetAbsTimeMean();
    697692      break;
    698693    case 35:
    699       if ((*this)[idx].IsExcluded())
    700         return kFALSE;
    701       val = (*this)[idx].GetAbsTimeMean();
    702       break;
    703     case 36:
    704694      if ((*this)[idx].IsExcluded())
    705695        return kFALSE;

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

    r3559 r3560  
    151151  SetHiGainSaturation       ( kFALSE );
    152152  SetLoGainSaturation       ( kFALSE );
    153   SetHiGainFitted           ( kFALSE );
    154   SetLoGainFitted           ( kFALSE );
    155153  SetExcluded               ( kFALSE );
    156154  SetBlindPixelMethodValid  ( kFALSE );
    … …  
    338336}
    339337
    340 // --------------------------------------------------------------------------
    341 //
    342 // Set the Fitted Bit from outside
    343 //
    344 void MCalibrationChargePix::SetHiGainFitted(Bool_t b )
    345 {
    346   b ?  SETBIT(fFlags, kHiGainFitted) : CLRBIT(fFlags, kHiGainFitted);
    347 }
    348    
    349 // --------------------------------------------------------------------------
    350 //
    351 // Set the Fitted Bit from outside
    352 //
    353 void MCalibrationChargePix::SetLoGainFitted(const Bool_t b )
    354 {
    355   b ?  SETBIT(fFlags, kLoGainFitted) : CLRBIT(fFlags, kLoGainFitted);
    356 }
    357338   
    358339// --------------------------------------------------------------------------
    … …  
    578559    return -1.;
    579560  return TMath::Sqrt(fTotalFFactorFFactorMethodVar);
    580 }
    581 
    582 Bool_t  MCalibrationChargePix::IsFitted()  const
    583 {
    584   return  IsHiGainSaturation() ? IsLoGainFitted() :  IsHiGainFitted();
    585561}
    586562

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

    r3551 r3560  
    590590    // 2) Fit the Hi Gain histograms with a Gaussian
    591591    //
    592     pix.SetHiGainFitted();
    593592    if (!hist.FitGaus())
    594593    //
    … …  
    596595    //
    597596      if (!hist.RepeatFit())
    598       {
    599         hist.BypassFit();
    600         pix.SetHiGainFitted(kFALSE);
    601         bad.SetHiGainNotFitted();
    602         bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);
    603       }
    604       else
    605         pix.SetHiGainFitted();
     597        {
     598          hist.BypassFit();
     599          bad.SetHiGainNotFitted();
     600          bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);
     601        }
    606602
    607603    //
    … …  
    660656    // 2) Fit the Lo Gain histograms with a Gaussian
    661657    //
    662     pix.SetLoGainFitted();
    663658    if (!hist.FitGaus())
    664659    //
    … …  
    668663        {
    669664          hist.BypassFit();
    670           pix.SetLoGainFitted(kFALSE);
    671665          bad.SetLoGainNotFitted();
    672666          if (pix.IsHiGainSaturation())
    673               bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);
     667            bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);
    674668        }
    675669
Note: See TracChangeset for help on using the changeset viewer.