Changeset 8767 for trunk


Ignore:
Timestamp:
11/27/07 14:32:02 (17 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/ganymed.cc

    r8741 r8767  
    3030    gLog << "                  Ganymed - MARS V" << MARSVER            << endl;
    3131    gLog << "   MARS -- Gammas Are Now Your Most Exciting Discovery"   << endl;
    32     gLog << "   Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
     32    gLog << "     Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
    3333    gLog << "========================================================" << endl;
    3434    gLog << endl;
    … …  
    207207    }
    208208
     209    gSystem->ExpandPathName(kSequences);
     210
    209211    if (gSystem->AccessPathName(kSequences, kFileExists))
    210212    {

  • trunk/MagicSoft/Mars/mbase/MLog.cc

    r8744 r8767  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.57 2007-09-07 12:17:13 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MLog.cc,v 1.58 2007-11-27 14:32:00 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    292292        case 1:  sout << MLog::kRed;     break;  // err
    293293        case 2:  sout << MLog::kYellow;  break;  // warn
    294         case 3:
    295         case 4:
    296         case 5:  sout << MLog::kGreen;   break;  // inf
     294        case 3:                                  // inf
     295        case 4:                                  // inf2
     296        case 5:  sout << MLog::kGreen;   break;  // inf3
    297297        default: sout << MLog::kBlue;    break;  // all others (dbg)
    298298        }

  • trunk/MagicSoft/Mars/mbase/MLogHtml.cc

    r8394 r8767  
    112112    case 1:  *fOut << "<font color='maroon'>";  break;  // err
    113113    case 2:  *fOut << "<font color='#FF6600'>"; break;  // warn (olive?)
    114     case 3:  *fOut << "<font color='green'>";   break;  // inf
     114    case 3:                                             // inf
     115    case 4:                                             // inf2
     116    case 5:  *fOut << "<font color='green'>";   break;  // inf3
    115117    default: *fOut << "<font color='navy'>";    break;  // all others (dbg)
    116118    }

  • trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc

    r8695 r8767  
    726726    case kWeakSource:
    727727        return GetEventsBackground()<1 ? -GetEventsExcess() : -GetEventsExcess()/TMath::Sqrt(GetEventsBackground());
     728    case kWeakSourceLogExcess:
     729        return GetEventsBackground()<1 ? -GetEventsExcess() : -GetEventsExcess()/TMath::Sqrt(GetEventsBackground())*TMath::Log10(GetEventsExcess());
    728730    }
    729731    return 0;

  • trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h

    r7777 r8767  
    3636        kExcess,
    3737        kGaussSigma,
    38         kWeakSource
     38        kWeakSource,
     39        kWeakSourceLogExcess
    3940    };
    4041    enum SignalFunc_t {

  • trunk/MagicSoft/Mars/mjtrain/MJTrainDisp.h

    r8719 r8767  
    3030    MJTrainDisp() : fTrainParameter(fgTrainParameter), fResultFunction("x"), fThetaCut(0.215), fNameOutput("Disp") { }
    3131
    32     void SetTrainParameter(const char *txt) { fTrainParameter=txt; }
     32    void SetTrainFunc(const char *par, const char *res="x")
     33    {
     34        fTrainParameter = par;
     35        fResultFunction = res;
     36    }
    3337
    3438    void SetThetaCut(Float_t cut=0.215) { fThetaCut=cut; }

  • trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

    r8765 r8767  
    221221// [2007-08-14 22:46:10]
    222222// Comparing the trigger rate with yesterday night we do not see an
    223 // improvement with the new focussing.
    224 //
     223// improvement with the new focussing.
     224//
     225// [2007-10-27 email]
     226// [...]
     227// When removing the cover of the motor all 4 nuts which fix the gear of
     228// the motor to the structure fell out. The motor was completely loose.
     229// [...]
     230// We checked also the second azimuth motor and .. the same situation.
     231// [...]
     232// Peter Sawallisch opened and fixed all 3 motors of MAGIC-I. We checked
     233// all critical screws that came to our minds and fixed them as much as
     234// possible with loctite and counter nuts. No damage whatsoever has been
     235// found.
    225236//
    226237//

  • trunk/MagicSoft/Mars/sponde.cc

    r8741 r8767  
    160160    // Setup sequence file and check for its existence
    161161    //
    162     const TString kInfile  = arg.GetArgumentStr(0);
    163     const TString kDataset = arg.GetArgumentStr(1);
    164     const TString kOutfile = arg.GetArgumentStr(2);
     162    TString kInfile  = arg.GetArgumentStr(0);
     163    TString kDataset = arg.GetArgumentStr(1);
     164    TString kOutfile = arg.GetArgumentStr(2);
    165165
    166166    if (kOutfile.IsNull() && kBatch)
    … …  
    170170    }
    171171
     172    gSystem->ExpandPathName(kInfile);
     173    gSystem->ExpandPathName(kDataset);
     174    gSystem->ExpandPathName(kOutfile);
     175
    172176    if (gSystem->AccessPathName(kInfile, kFileExists))
    173177    {
    174         gLog << err << "Sorry, sequences file '" << kInfile << "' doesn't exist." << endl;
     178        gLog << err << "Sorry, ganymed root-file '" << kInfile << "' doesn't exist." << endl;
    175179        return 2;
    176180    }
    … …  
    246250            return 2;
    247251        }
    248         if (kDebugEnv>0)
     252        if (kDebugEnv>0 || gLog.GetDebugLevel()>=2)
    249253            env.PrintUntouched();
    250254
Note: See TracChangeset for help on using the changeset viewer.