Changeset 9278 for trunk


Ignore:
Timestamp:
01/27/09 14:01:48 (16 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r9277 r9278  
    7474   * msimrelfector/MSimReflector.cc:
    7575     - added sanity check if reflector is valid
     76
     77   * datacenter/macros/insertdataset.C:
     78     - added fPriority
     79
     80   * datacenter/macros/plotoptical.C:
     81     - write a root-file as the other plot-macros do
     82
     83   * mreflector/MHReflector.cc:
     84     - added some SetDirectory(NULL), although this class is a candidate
     85       for removal
     86
     87   * mjobs/MJCut.cc, mjobs/MJCalibrateSignal.cc:
     88     - make the CheckEnv fail if kFALSE is returned
    7689
    7790

  • trunk/MagicSoft/Mars/datacenter/macros/insertdataset.C

    r8996 r9278  
    102102        return 0;
    103103
    104     vals = Form("fDataSetNumber='%s', fDataSetInserted=Now()", number.Data());
     104    vals = Form("fDataSetNumber='%s', fPriority='%s', fDataSetInserted=Now()",
     105                number.Data(), number.Data());
    105106    rc = serv.Insert("DataSetProcessStatus", vals);
    106107

  • trunk/MagicSoft/Mars/datacenter/macros/plotoptical.C

    r9120 r9278  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: plotoptical.C,v 1.10 2008-08-15 12:14:52 dorner Exp $
     2! $Name: not supported by cvs2svn $:$Id: plotoptical.C,v 1.11 2009-01-27 13:56:15 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    191191    plotalloptical(plot, source);
    192192    // Use this to create output plots automatically
    193     //  d->SaveAsRoot("plotoptical.root");
     193    d->SaveAsRoot("plotoptical.root");
    194194    //  d->SaveAsPS("plotoptical.ps");
    195195
    … …  
    222222    plotalloptical(plot, source);
    223223    // Use this to create output plots automatically
    224     //  d->SaveAsRoot(plot+"plotoptical.root");
     224    d->SaveAsRoot("plotoptical.root");
    225225    //  d->SaveAsPS("plotoptical.ps");
    226226
    … …  
    254254
    255255    // Use this to create output plots automatically
    256     //  d->SaveAsRoot("plotoptical.root");
     256    d->SaveAsRoot("plotoptical.root");
    257257    //  d->SaveAsPS("plotoptical.ps");
    258258

  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r9230 r9278  
    244244    }
    245245
     246    // --------------------------------------------------------------------------------
     247
    246248    *fLog << inf;
    247249    fLog->Separator(GetDescriptor());
    … …  
    250252
    251253
    252     //if (!CheckEnv())
    253     //    return kFALSE;
    254 
    255     CheckEnv();
     254    if (!CheckEnv())
     255        return kFALSE;
    256256
    257257    // --------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mjobs/MJCut.cc

    r9067 r9278  
    555555        return kFALSE;
    556556
    557     CheckEnv();
     557    if (!CheckEnv())
     558        return kFALSE;
    558559
    559560    // --------------------------------------------------------------------------------
    … …  
    576577    else
    577578        *fLog << all << "No source position applied..." << endl;
     579
     580    // ADD A CHECK FOR THE SOURCE POSITION by COMPARISON WITH RA/DEC
    578581
    579582    MParList plist;

  • trunk/MagicSoft/Mars/mreflector/MHReflector.cc

    r9153 r9278  
    5959    fTitle = title ? title : "Histogram for the reflected photons";
    6060
    61     fHistXY.SetDirectory(NULL);
    6261    fHistXY.SetName("ReflXY");
    6362    fHistXY.SetTitle("Histogram vs X/Y and Energy");
    … …  
    6564    fHistXY.SetYTitle("Y [\\circ]");
    6665    fHistXY.SetZTitle("E [GeV]");
     66    fHistXY.SetDirectory(NULL);
    6767    fHistXY.Sumw2();
    6868
    69     fHistRad.SetDirectory(NULL);
    7069    fHistRad.SetName("ReflRad");
    7170    fHistRad.SetTitle("Histogram vs Radius and Energy");
    … …  
    7372    fHistRad.SetYTitle("R [\\circ]");
    7473    fHistRad.SetZTitle("Cnts/deg^{2}");
     74    fHistRad.SetDirectory(NULL);
    7575    fHistRad.Sumw2();
    7676
    77     fHistSize.SetDirectory(NULL);
    7877    fHistSize.SetName("ReflSize");
    7978    fHistSize.SetTitle("Histogram vs Size and Energy");
    … …  
    8180    fHistSize.SetYTitle("N\\gamma");
    8281    fHistSize.SetZTitle("Cnts");
     82    fHistSize.SetDirectory(NULL);
    8383    fHistSize.Sumw2();
    8484
    … …  
    111111        return kFALSE;
    112112    }
     113
    113114    MGeomCam *geom = (MGeomCam*)pList->FindObject("MGeomCam");
    114115    if (!geom)

  • trunk/MagicSoft/Mars/msimcamera/MSimTrigger.cc

    r9274 r9278  
    302302    if (triggers.GetEntriesFast()==0)
    303303    {
    304         *fLog << all << rmlo << "/" << rmhi << " trigger out of valid range. No trigger raised." << endl;
     304        if (rmlo>0 || rmhi>0)
     305            *fLog << all << rmlo << "/" << rmhi << " trigger out of valid range. No trigger raised." << endl;
    305306        return kTRUE;
    306307    }
Note: See TracChangeset for help on using the changeset viewer.