Changeset 2879 for trunk/MagicSoft


Ignore:
Timestamp:
01/21/04 22:45:54 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r2878 r2879  
    1515     - calculate PedRMS as RMS of the sums, later renormalized to units
    1616       of RMS/slice (eliminate the wrong effect of odd and even slices)
     17
     18   * mcalib/MCalibrationCalc.cc
     19     - if bit SkipBlindPixelFit is set, now number of photons outside
     20       plexiglass is not intended to be calculated any more (previous
     21       bug)
     22
    1723
    1824 2004/01/21: Abelardo Moralejo
  • trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

    r2852 r2879  
    495495  fCalibrations->CutEdges();
    496496
    497   //
    498   // Get pointer to blind pixel
    499   //
    500   MCalibrationBlindPix &blindpixel = *(fCalibrations->GetBlindPixel());
    501 
    502   *fLog << inf << GetDescriptor() << ": Fitting the Blind Pixel" << endl;
    503 
    504497  //
    505498  // Fit the blind pixel
     
    507500  if (TESTBIT(fFlags,kUseBlindPixelFit))
    508501    {
     502      //
     503      // Get pointer to blind pixel
     504      //
     505      MCalibrationBlindPix &blindpixel = *(fCalibrations->GetBlindPixel());
     506     
     507      *fLog << inf << GetDescriptor() << ": Fitting the Blind Pixel" << endl;
    509508
    510509      if (!blindpixel.FitCharge())
     
    517516      blindpixel.DrawClone();
    518517    }
     518  else
     519    *fLog << inf << GetDescriptor() << ": Skipping Blind Pixel Fit " << endl;
     520
    519521 
    520522  *fLog << inf << GetDescriptor() << ": Fitting the Normal Pixels" << endl;
     
    559561    }
    560562
    561   if (!fCalibrations->CalcNumPhotInsidePlexiglass())
    562     {
    563       *fLog << err << GetDescriptor()
    564             << ": Could not calculate the number of photons from the blind pixel " << endl;
    565       return kFALSE;
    566     }
    567563 
     564  if (TESTBIT(fFlags,kUseBlindPixelFit))
     565    {
     566     
     567      if (!fCalibrations->CalcNumPhotInsidePlexiglass())
     568        {
     569          *fLog << err
     570                << "Could not calculate the number of photons from the blind pixel " << endl;
     571          *fLog << err
     572                << "You can try to calibrate using the MCalibrationCalc::SkipBlindPixelFit()" << endl;
     573          return kFALSE;
     574        }
     575    }
     576  else
     577    *fLog << inf << GetDescriptor() << ": Skipping Blind Pixel Fit " << endl;
     578
    568579  fCalibrations->SetReadyToSave();
    569580 
Note: See TracChangeset for help on using the changeset viewer.