Changeset 2795


Ignore:
Timestamp:
01/13/04 17:41:03 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r2794 r2795  
    3333     - Square Root of Reduced Sigmas not taken, if they are < 0.
    3434     - Reduced Sigma / Charge squared replaced by reduced sigma / charge
     35
     36   * mcalib/MCalibrationCalc.cc
     37     - Blind Pixel is not additionally treated as normal pixel any more
     38     - Blind Pixel Draw replaced by DrawClone
    3539
    3640
  • trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

    r2765 r2795  
    258258      if (pix->IsFitValid())
    259259        {
     260
     261          Float_t rsigma = pix->GetRSigmaSquare();
     262          if (rsigma > 0.)
     263            rsigma = TMath::Sqrt(rsigma);
     264
    260265          *fLog << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " << pix->GetPedRms()
    261266                << " Reduced Charge: " << pix->GetCharge() << " +- "
    262                 << pix->GetSigmaCharge() << " Reduced Sigma: " << TMath::Sqrt(pix->GetRSigmaSquare()) << endl;
     267                << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma
     268                << " Nr Phe's: " << pix->GetPheFFactorMethod() << endl;
    263269          id++;
    264270        }
     
    278284        if (!pix->IsFitValid())
    279285          {
     286
     287            Float_t rsigma = pix->GetRSigmaSquare();
     288            if (rsigma > 0.)
     289              rsigma = TMath::Sqrt(rsigma);
     290           
    280291            *fLog << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " << pix->GetPedRms()
    281292                  << " Reduced Charge: " << pix->GetCharge() << " +- "
    282                 << pix->GetSigmaCharge() << " Reduced Sigma: " << TMath::Sqrt(pix->GetRSigmaSquare()) << endl;
     293                << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma << endl;
    283294            id++;
    284295          }
     
    314325    return kFALSE;
    315326
     327  if (!(*this)[idx].IsFitValid())
     328    {
     329      val = -1.;
     330      return kFALSE;
     331    }
     332 
    316333  switch (type)
    317334    {
     
    338355      break;
    339356    case 7:
    340       val = (*this)[idx].GetTimeProb();
     357      val = (*this)[idx].GetTimeChiSquare();
    341358      break;
    342359    case 8:
     
    377394      break;
    378395    case 17:
    379       if ((*this)[idx].GetCharge() != 0.)
    380         val = ((*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge())*
    381               ((*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge());
     396      if ( (*this)[idx].GetRSigmaSquare() > 0. && (*this)[idx].GetCharge() > 0. )
     397        val = TMath::Sqrt((*this)[idx].GetRSigmaSquare()) / (*this)[idx].GetCharge();
    382398      else
    383         val = -1.;
     399        val = -1.;
    384400      break;
    385401    default:
    386402      return kFALSE;
    387403    }
    388   return val>=0;
     404  return val!=-1.;
    389405}
    390406
Note: See TracChangeset for help on using the changeset viewer.