Changeset 3189 for trunk


Ignore:
Timestamp:
02/16/04 13:47:10 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r3188 r3189  
    7474   * mcalib/MHCalibrationPixel.cc:
    7575     - after deletion of instances in Clear() initialize pointer to NULL
     76
     77   * mcalib/MCalibrationCalc.cc, mcalib/MHCalibrationBlindPixel.cc:
     78     - fixed usage of logging stream output levels
    7679
    7780
  • trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

    r3180 r3189  
    682682
    683683  if (TESTBIT(fFlags,kUseBlindPixelFit) && fCalibrations->IsBlindPixelMethodValid())
    684     {
     684  {
    685685      if (!fCalibrations->CalcFluxInsidePlexiglass())
    686         {
    687           *fLog << err
    688                 << "Could not calculate the number of photons from the blind pixel " << endl;
    689           *fLog << err
    690                 << "You can try to calibrate using the MCalibrationCalc::SkipBlindPixelFit()" << endl;
     686      {
     687          *fLog << warn << "Could not calculate the number of photons from the blind pixel " << endl;
     688          *fLog << "You can try to calibrate using the MCalibrationCalc::SkipBlindPixelFit()" << endl;
    691689        fCalibrations->SetBlindPixelMethodValid(kFALSE);         
    692         }
    693     }
     690      }
     691  }
    694692  else
    695693    *fLog << inf << GetDescriptor() << ": Skipping Blind Pixel Calibration! " << endl;
     
    697695
    698696  if (fCalibrations->IsPINDiodeMethodValid())
    699     {
     697  {
    700698      if (!fCalibrations->CalcFluxOutsidePlexiglass())
    701         {
    702           *fLog << err
    703                 << "Could not calculate the number of photons from the PIN Diode " << endl;
     699      {
     700          *fLog << warn << "Could not calculate the number of photons from the PIN Diode " << endl;
    704701          fCalibrations->SetPINDiodeMethodValid(kFALSE);
    705         }
    706     }
     702      }
     703  }
    707704  else
    708     *fLog << inf << GetDescriptor() << ": Skipping PIN Diode Calibration! " << endl;
     705      *fLog << inf << GetDescriptor() << ": Skipping PIN Diode Calibration! " << endl;
    709706
    710707  fCalibrations->SetReadyToSave();
     
    734731
    735732  if (sat)
    736     {
     733  {
    737734      *fLog << err << "HI Gain Saturation occurred in the blind pixel! "
    738735            << " Do not know yet how to treat this ... aborting " << endl;
    739       *fLog << err << "If you need absolutely any other kind of calibration, "
     736      *fLog << "If you need absolutely any other kind of calibration, "
    740737            << " use SkipBlindPixelFit() " << endl;
    741738      return kFALSE;
    742     }
     739  }
    743740
    744741  signal = (Float_t)sum;
  • trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.cc

    r3186 r3189  
    687687{
    688688 
    689   *fLog << err << "min: " << min << endl;
    690   *fLog << err << "max: " << max << endl; 
     689  *fLog << inf << "min: " << min << endl;
     690  *fLog << "max: " << max << endl;
    691691
    692692  //
     
    743743  const Double_t electronicAmp_limit  = fgBlindPixelElectronicAmpError;
    744744
    745   *fLog << err << "pedestal: " << fMeanPedestal << endl;
    746   *fLog << err << "sigma: "    << fSigmaPedestal << endl; 
     745  *fLog << inf << "pedestal: " << fMeanPedestal << endl;
     746  *fLog << "sigma: "    << fSigmaPedestal << endl;
    747747
    748748  //
     
    923923
    924924  *fLog << inf << "Results of the Blind Pixel Fit: " << endl;
    925   *fLog << inf << "Chisquare: " << fChisquare << endl;
    926   *fLog << inf << "DoF: " << fNdf << endl;
    927   *fLog << inf << "Probability: " << fProb << endl;
     925  *fLog << "Chisquare: " << fChisquare << endl;
     926  *fLog << "DoF: " << fNdf << endl;
     927  *fLog << "Probability: " << fProb << endl;
    928928
    929929  //
     
    10011001
    10021002  *fLog << inf << "Results of the Times Fit: " << endl;
    1003   *fLog << inf << "Chisquare: "   << fTimeGausFit->GetChisquare() << endl;
    1004   *fLog << inf << "Ndf: "         << fTimeGausFit->GetNDF() << endl;
     1003  *fLog << "Chisquare: "   << fTimeGausFit->GetChisquare() << endl;
     1004  *fLog << "Ndf: "         << fTimeGausFit->GetNDF() << endl;
    10051005
    10061006  return kTRUE;
Note: See TracChangeset for help on using the changeset viewer.