Changeset 8243 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
01/11/07 14:15:24 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8242 r8243  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20 2007/01/11 Thomas Bretz
     21
     22   * mbase/MLogManip.cc:
     23     - removed the obsolete include of MLog.h
     24
     25   * mbase/MLogManip.h:
     26     - encapsulated an include in ifdefs
     27
     28
    2029
    2130 2007/01/11 Daniela Dorner

  • trunk/MagicSoft/Mars/mbase/MLogManip.h

    r7808 r8243  
    44#include <iomanip>
    55
     6#ifndef MARS_MLog
    67#include "MLog.h"
     8#endif
    79
    810// --------------------- simple manipulators -----------------------
    … …  
    1921    return lout;
    2022}
    21 
    2223
    2324// ----------------------------- debug -----------------------------

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

    r8203 r8243  
    12591259  if (hist.IsEmpty())
    12601260  {
    1261       *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram empty." << endl;
     1261      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram empty." << endl;
    12621262      return;
    12631263  }
    12641264  if (hist.IsOnlyOverflow())
    12651265  {
    1266       *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only overflows." << endl;
     1266      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only overflows." << endl;
    12671267      return;
    12681268  }
    12691269  if (hist.IsOnlyUnderflow())
    12701270  {
    1271       *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only underflows." << endl;
     1271      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only underflows." << endl;
    12721272      return;
    12731273  }
    … …  
    13661366  if (hist.IsOnlyOverflow())
    13671367  {
    1368       *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only overflows." << endl;
     1368      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only overflows." << endl;
    13691369      return;
    13701370  }
    13711371  if (hist.IsOnlyUnderflow())
    13721372  {
    1373       *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only underflows." << endl;
     1373      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only underflows." << endl;
    13741374      return;
    13751375  }

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

    r8210 r8243  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.47 2006-11-02 19:50:53 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.48 2007-01-11 14:14:37 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    960960        if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
    961961          {
    962               *fLog << warn << "Pixel   " << setw(4) << i << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << 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 << "Area    " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << 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 << "Sector  " << setw(4) << j << ": More than " << Form("%.1f%%", fNumLoGainSaturationLimit*100) << " lo-gains saturated." << 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/mhflux/MHEnergyEst.cc

    r8047 r8243  
    435435    h = (TH1D*)fHEnergy.Project3D("ey");
    436436    h->SetBit(TH1::kNoStats);
    437     h->SetTitle("Energy disribution: Monte Carlo E_{mc} (black), Estimated E_{est} (green)");
     437    h->SetTitle("Energy disribution: Monte Carlo E_{mc} (black), Estimated E_{est} (blue)");
    438438    h->SetXTitle("E [GeV]"); // E_mc
    439439    h->SetYTitle("Counts");
    … …  
    450450    h->SetDirectory(NULL);
    451451    h->SetMarkerStyle(kFullDotMedium);
    452     h->SetLineColor(kGreen);
    453     h->SetMarkerColor(kGreen);
     452    h->SetLineColor(kBlue);
     453    h->SetMarkerColor(kBlue);
    454454    h->Draw("same");
    455455
Note: See TracChangeset for help on using the changeset viewer.