Changeset 8210 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
11/02/06 19:54:22 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r8208 r8210  
    6363     - removed obsolete SignalStartBin data members
    6464     - set last hi-gain extraction slace from 15 to 16
     65
     66   * mcalib/MCalibCalcFromPast.[h,cc]:
     67     - some changes to the log-output
     68
     69   * mhcalib/MHCalibrationChargeCam.cc:
     70     - reformatted some output
     71
     72   * mraw/MRawRunHeader.cc:
     73     - reset setfill in output stream
     74
     75   * mimage/MNewImagePar.cc:
     76     - do not take unmapped pixels into account
     77     - do not start with d=max_radius^2 but with FLT_MAX
    6578
    6679
  • trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

    r8147 r8210  
    289289  ReInitialize();
    290290
     291  *fLog << all << "MCalibCalcFromPast: Calibration Update..." << flush;
     292
    291293  //
    292294  // Finalize Possible calibration histogram classes...
    293295  //
    294   *fLog << inf << GetDescriptor() << ": Finalize calibration histograms: " << flush;
     296  *fLog << inf << "Finalize calibration histograms:" << endl;
    295297
    296298  // This fills the IntensityCam which are newly created by
    297299  // ReInitialize with the result of the last calib cycle
    298   if (Finalize("MHCalibrationChargeCam"))      *fLog << "MHCalibrationChargeCam..." << flush;
    299   if (Finalize("MHCalibrationChargeBlindCam")) *fLog << "MHCalibrationChargeBlindCam..." << flush;
    300   if (Finalize("MHCalibrationRelTimeCam"))     *fLog << "MHCalibrationRelTimeCam..." << flush;
     300  Finalize("MHCalibrationChargeCam");
     301  Finalize("MHCalibrationChargeBlindCam");
     302  Finalize("MHCalibrationRelTimeCam");
    301303
    302304  //
     
    360362// - MHCalibrationCam::ResetHists()
    361363//
    362 Bool_t MCalibCalcFromPast::Finalize(const char* name, Bool_t finalize)
     364void MCalibCalcFromPast::Finalize(const char* name, Bool_t finalize)
    363365{
    364366    MHCalibrationCam *hist = (MHCalibrationCam*)fParList->FindObject(name, "MHCalibrationCam");
    365367    if (!hist)
    366         return kFALSE;
     368        return;
     369
     370    *fLog << inf << "Finalize " << name << ":" << endl;
    367371
    368372    if (finalize)
     
    370374
    371375    hist->ResetHists();
    372     return kTRUE;
    373376}
    374377
  • trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h

    r7288 r8210  
    6969  // MCalibCalcFromPast
    7070  Bool_t ReInitialize();
    71   Bool_t Finalize(const char* name, Bool_t finalize=kTRUE);
     71  void Finalize(const char* name, Bool_t finalize=kTRUE);
    7272
    7373  Bool_t UpdateMeanPhes();
  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

    r8192 r8210  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.46 2006-11-01 15:48:31 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.47 2006-11-02 19:50:53 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
     
    960960        if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
    961961          {
    962             *fLog << warn << "Saturated Lo Gain histogram in pixel: " << i << endl;
     962              *fLog << warn << "Pixel   " << setw(4) << i << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
    963963            bad.SetUncalibrated( MBadPixelsPix::kLoGainSaturation );
    964964            if (IsOscillations())
     
    10201020        if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
    10211021          {
    1022             *fLog << warn << "Saturated Lo Gain histogram in area idx: " << j << endl;
     1022              *fLog << warn << "Area    " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
    10231023            if (IsOscillations())
    10241024                histlo.CreateFourierSpectrum();
     
    10631063        if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
    10641064          {
    1065             *fLog << warn << "Saturated Lo Gain histogram in sector: " << j << endl;
     1065              *fLog << warn << "Sector  " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << endl;
    10661066            bad.SetUncalibrated( MBadPixelsPix::kLoGainSaturation );
    10671067            if (IsOscillations())
  • trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

    r7543 r8210  
    151151    Float_t maxpix2 = 0;                                 // [#phot]
    152152
    153     const Double_t d = geom.GetMaxRadius()*geom.GetMaxRadius();
     153    const Double_t d = FLT_MAX; //geom.GetMaxRadius()*geom.GetMaxRadius();
    154154    Double_t dist[3] = { d, d, d };
    155155    Int_t    idx[3]  = { -1, -1, -1};
     
    166166    for (UInt_t i=0; i<npix; i++)
    167167    {
     168        const MSignalPix &pix = evt[i];
     169        if (pix.IsPixelUnmapped())
     170            continue;
     171
    168172        // Get geometry of pixel
    169173        const MGeomPix &gpix = geom[i];
     
    201205                }
    202206
    203         const MSignalPix &pix = evt[i];
    204207        if (!pix.IsPixelUsed())
    205208            continue;
  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

    r8005 r8210  
    504504        *fLog << setfill('0') << setw(3) << (*fPixAssignment)[i] << " ";
    505505
    506     *fLog << dec << endl;
     506    *fLog << dec << setfill(' ') << endl;
    507507}
    508508
Note: See TracChangeset for help on using the changeset viewer.