Changeset 2085 for trunk


Ignore:
Timestamp:
05/07/03 08:53:48 (22 years ago)
Author:
wittek
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mhist/MHMatrix.cc

    r2043 r2085  
    737737//              for which a target distribution may be given;
    738738//   thsh       histogram containing the target distribution of the variable
    739 //   nmaxevts   maximum number of events in the reference matrix
     739//   nmaxevts   the number of events the reference matrix should have after
     740//              the renormalization
    740741//   rest       a TMatrix conatining the resulting (not choosen)
    741742//              columns of the primary matrix. Maybe NULL if you
    … …  
    757758    }
    758759
     760
    759761    if (nmaxevts>fM.GetNrows())
    760762    {
    761         *fLog << dbginf << "Maximum no.of events exceeds no.of events" << endl;
    762         *fLog << dbginf << "        set Maximum no.of events = no.of events" << endl;
     763      *fLog << dbginf << "No.of requested events (" << nmaxevts
     764            << ") exceeds no.of available events (" << fM.GetNrows()
     765            << ")" << endl;
     766        *fLog << dbginf
     767              << "        set no.of requested events = no.of available events"
     768              << endl;
    763769        nmaxevts = fM.GetNrows();
    764770    }
    765771
     772
    766773    if (nmaxevts<0)
    767774    {
    768         *fLog << err << dbginf << "Number of maximum events < 0" << endl;
     775        *fLog << err << dbginf << "Number of requested events < 0" << endl;
    769776        return kFALSE;
    770777    }
    … …  
    875882
    876883    if (evtcount1 < nmaxevts)
    877         *fLog << warn << "The reference sample contains less events (" << evtcount1 << ") than required (" << nmaxevts << ")" << endl;
     884        *fLog << warn << "The reference sample contains less events (" << evtcount1 << ") than requested (" << nmaxevts << ")" << endl;
    878885
    879886    if (TestBit(kEnableGraphicalOutput))
    … …  
    926933    if (nmaxevts>fM.GetNrows())
    927934    {
    928         *fLog << dbginf << "Maximum no.of events exceeds no.of events" << endl;
    929         *fLog << dbginf << "        set Maximum no.of events = no.of events" << endl;
     935      *fLog << dbginf << "No.of requested events (" << nmaxevts
     936            << ") exceeds no.of available events (" << fM.GetNrows()
     937            << ")" << endl;
     938        *fLog << dbginf
     939              << "        set no.of requested events = no.of available events"
     940              << endl;
    930941        nmaxevts = fM.GetNrows();
    931942    }
    … …  
    933944    if (nmaxevts<0)
    934945    {
    935         *fLog << err << dbginf << "Number of maximum events < 0" << endl;
     946        *fLog << err << dbginf << "Number of requested events < 0" << endl;
    936947        return kFALSE;
    937948    }
    … …  
    979990
    980991    if (evtcount1 < nmaxevts)
    981         *fLog << warn << "The reference sample contains less events (" << evtcount1 << ") than required (" << nmaxevts << ")" << endl;
     992        *fLog << warn << "The reference sample contains less events (" << evtcount1 << ") than requested (" << nmaxevts << ")" << endl;
    982993
    983994    if (!rest)
Note: See TracChangeset for help on using the changeset viewer.