Changeset 8011 for trunk


Ignore:
Timestamp:
10/07/06 14:57:12 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
1 added
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8010 r8011  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2006/10/07 Thomas Bretz
     22
     23   * Makefile.conf.general:
     24     - removed ROOTVER definition ROOT_RELEASE can be used instead
     25
     26   * callisto.cc:
     27     - exchanged some checks to get a more reasonable output
     28
     29   * callisto.rc, callisto_Dec04Jan05.rc:
     30     - removed some obsolete resources for simplicity
     31
     32   * callisto.cc, ganymed.cc, mars.cc, merpp.cc, readdaq.cc, readreaw.cc,
     33     showlog.cc, showplot.cc, sinope.cc, star.cc
     34     - added the new root version check
     35     - replaced ROOTVER by ROOT_RELEASE
     36
     37   * sinope.cc:
     38     - adapted Usage() to fit the other executables
     39
     40   * mbase/MAGIC.h:
     41     - added new namespace MARS with a new function CheckRootVer
     42
     43   * mbase/MAGIC.cc:
     44     - added
     45
     46   * mbase/MEvtLoop.cc, mbase/MStatusDisplay.cc:
     47     - replaced ROOTVER by ROOT_RELEASE
     48
     49   * mbase/Makefile:
     50     - added new MAGIC.cc
     51
     52   * mbase/BaseLinkDef.h:
     53     - added namespace MAGIC.cc
     54
     55
    2056
    2157 2006/10/07 Daniela Dorner, Thomas Bretz

  • trunk/MagicSoft/Mars/Makefile.conf.general

    r7879 r8011  
    33#
    44
    5 ROOTVER    =  `root-config --version`
    65ROOTLIBS   =  `root-config --libs` -lASImage -lMinuit -lHistPainter -lThread
    76ROOTGLIBS  =  `root-config --glibs` -lASImage -lMinuit -lHistPainter -lThread
    … …  
    1817#   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
    1918#
    20 DEFINES  = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
     19DEFINES  = -DMARSVER=\"\<cvs\>\" -D__MARS__ $(ARCHDEF) $(MARSDEFINES)
    2120
    2221CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)

  • trunk/MagicSoft/Mars/NEWS

    r8003 r8011  
    33 *** Version  <cvs>
    44
    5    - callisto: New swapped pixels have been found and corrected
     5   - general: all executables now check consistency of the root version
     6     installed with the root version used for compilation
    67
    78   - general: The algorithm to build seqeunces has been redesigned
    … …  
    4344
    4445   - merpp: didn't recognize files with the extension .raw.gz - fixed.
     46
     47   - callisto: New swapped pixels have been found and corrected. For
     48     details see MRawRunHeader::FixAssignment()
    4549
    4650   - callisto: Callisto now raises an error if one of the input files could

  • trunk/MagicSoft/Mars/callisto.cc

    r7989 r8011  
    3333    gLog << "                 Callisto - MARS V" << MARSVER            << endl;
    3434    gLog << "    MARS -- CALibrate LIght Signals and Time Offsets"     << endl;
    35     gLog << "      Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
     35    gLog << "      Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
    3636    gLog << "========================================================" << endl;
    3737    gLog << endl;
    … …  
    142142int main(int argc, char **argv)
    143143{
     144    if (!MARS::CheckRootVer())
     145        return 0xff;
     146
    144147    //
    145148    // Evaluate arguments
    … …  
    198201        kModeC = kTRUE;
    199202
     203    //
     204    // check for the right usage of the program
     205    //
     206    if (arg.GetNumArguments()!=1)
     207    {
     208        Usage();
     209        return 2;
     210    }
     211
     212    if (arg.GetNumOptions()>0)
     213    {
     214        gLog << warn << "WARNING - Unknown commandline options..." << endl;
     215        arg.Print("options");
     216        gLog << endl;
     217        return 2;
     218    }
     219
    200220    if (!kModeC && !kModeY /*&& !kUseTest*/)
    201221    {
    202         gLog << err << "Neither calibration (-c) nor signal extraction (-y) or test-mode (--use-test) specified!" << endl;
     222        gLog << err << "Neither calibration (-c), signal extraction (-y) or test-mode (--use-test)" << endl;
     223        gLog <<        "specified! You can also give the operation mode by the options defining the" << endl;
     224        gLog <<        "output path --outc, --outy or --out." << endl;
    203225        Usage();
    204226        return 2;
    … …  
    228250    if (kModeC && kModeY)
    229251        kInpathY = kOutpathC;
    230 
    231     if (arg.GetNumOptions()>0)
    232     {
    233         gLog << warn << "WARNING - Unknown commandline options..." << endl;
    234         arg.Print("options");
    235         gLog << endl;
    236         return 2;
    237     }
    238 
    239     //
    240     // check for the right usage of the program
    241     //
    242     if (arg.GetNumArguments()!=1)
    243     {
    244         Usage();
    245         return 2;
    246     }
    247252
    248253    //

  • trunk/MagicSoft/Mars/callisto.rc

    r8000 r8011  
    8282#MJPedestalC1.ExtractSignal.ExtractionType: Integral <default>
    8383#MJPedestalC1.ExtractSignal.ExtractionType: Amplitude
    84 # -------------------------------------------------------------------------
    85 # Define here parameters valid for the sliding window:
    86 # -------------------------------------------------------------------------
    87 #MJPedestalC1.ExtractSignal.HiGainWindowSize:     6
    88 #MJPedestalC1.ExtractSignal.LoGainWindowSize:     6
    89 # -------------------------------------------------------------------------
    90 # Define here parameters valid for the digital filter with peak search:
    91 # -------------------------------------------------------------------------
    92 #MJPedestalC1.ExtractSignal.OffsetLeftFromPeak:   3
    93 #MJPedestalC1.ExtractSignal.OffsetRightFromPeak:  3
    94 #MJPedestalC1.ExtractSignal.PeakSearchWindowSize: 2
    95 #MJPedestalC1.ExtractSignal.HiGainFailureLimit:  10
    96 #MJPedestalC1.ExtractSignal.LoGainFailureLimit:  25
    9784
    9885# -------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

    r8001 r8011  
    9292#MJPedestalC1.ExtractSignal.ExtractionType: Integral <default>
    9393#MJPedestalC1.ExtractSignal.ExtractionType: Amplitude
    94 # -------------------------------------------------------------------------
    95 # Define here parameters valid for the sliding window:
    96 # -------------------------------------------------------------------------
    97 #MJPedestalC1.ExtractSignal.HiGainWindowSize:     6
    98 #MJPedestalC1.ExtractSignal.LoGainWindowSize:     6
    99 # -------------------------------------------------------------------------
    100 # Define here parameters valid for the digital filter with peak search:
    101 # -------------------------------------------------------------------------
    102 #MJPedestalC1.ExtractSignal.OffsetLeftFromPeak:   3
    103 #MJPedestalC1.ExtractSignal.OffsetRightFromPeak:  3
    104 #MJPedestalC1.ExtractSignal.PeakSearchWindowSize: 2
    105 #MJPedestalC1.ExtractSignal.HiGainFailureLimit:  10
    106 #MJPedestalC1.ExtractSignal.LoGainFailureLimit:  25
    10794
    10895# -------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/ganymed.cc

    r7753 r8011  
    3030    gLog << "                  Ganymed - MARS V" << MARSVER            << endl;
    3131    gLog << "   MARS -- Gammas Are Now Your Most Exciting Discovery"   << endl;
    32     gLog << "   Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
     32    gLog << "   Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
    3333    gLog << "========================================================" << endl;
    3434    gLog << endl;
    … …  
    9191int main(int argc, char **argv)
    9292{
     93    if (!MARS::CheckRootVer())
     94        return 0xff;
     95
    9396    //
    9497    // Evaluate arguments

  • trunk/MagicSoft/Mars/mars.cc

    r7432 r8011  
    3636    gLog << "                    MARS V" << MARSVER              << endl;
    3737    gLog << "    Magic Analysis and Reconstruction Software"     << endl;
    38     gLog << "   Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
     38    gLog << "   Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
    3939    gLog << "==================================================" << endl;
    4040    gLog << endl;
    … …  
    5353int main(int argc, char **argv)
    5454{
     55    if (!MARS::CheckRootVer())
     56        return 0xff;
     57
    5558    //
    5659    // Evaluate arguments

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

    r7438 r8011  
    1818// I/O
    1919#pragma link C++ class MZlib+;
     20//#pragma link C++ class MBzlib2+;
    2021
    2122// Basic Network Tools
    … …  
    2324
    2425// Basic Tools
     26#pragma link C++ namespace MARS;
    2527#pragma link C++ namespace MMath;
    2628#pragma link C++ class MString+;

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

    r7804 r8011  
    3535const Double_t kRad2Deg = 180.0/3.1415926535897932384626433832795028841971693993751;
    3636
     37namespace MARS
     38{
     39    bool CheckRootVer();
     40}
     41
    3742#endif

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

    r7888 r8011  
    109109    SetBit(kMustCleanup);
    110110
    111     *fLog << inf << underline << "Instantiated MEvtLoop (" << name << "), using ROOT v" << ROOTVER << endl;
     111    *fLog << inf << underline << "Instantiated MEvtLoop (" << name << "), using ROOT v" << ROOT_RELEASE << endl;
    112112}
    113113

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

    r7887 r8011  
    451451
    452452    // Add root version
    453     l = new TGLabel(f, MString::Format("Using ROOT v%s", ROOTVER));
     453    l = new TGLabel(f, MString::Format("Using ROOT v%s", ROOT_RELEASE));
    454454    fList->Add(l);
    455455

  • trunk/MagicSoft/Mars/mbase/Makefile

    r7438 r8011  
    1818CINT = Base
    1919
    20 SRCFILES = MLogo.cc \
     20SRCFILES = MAGIC.cc \
     21           MLogo.cc \
    2122           MArgs.cc \
    2223           MString.cc \

  • trunk/MagicSoft/Mars/merpp.cc

    r7801 r8011  
    5353    gLog << "                MERPP - MARS V" << MARSVER          << endl;
    5454    gLog << "     MARS - Merging and Preprocessing Program"      << endl;
    55     gLog << "   Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
     55    gLog << "   Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
    5656    gLog << "==================================================" << endl;
    5757    gLog << endl;
    … …  
    147147int main(const int argc, char **argv)
    148148{
     149    if (!MARS::CheckRootVer())
     150        return 0xff;
     151
    149152    //
    150153    // Evaluate arguments

  • trunk/MagicSoft/Mars/readdaq.cc

    r7579 r8011  
    3939    gLog << "              ReadDaq - MARS V" << MARSVER          << endl;
    4040    gLog << "       MARS - Read and print daq data files"        << endl;
    41     gLog << "   Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
     41    gLog << "   Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
    4242    gLog << "==================================================" << endl;
    4343    gLog << endl;
    … …  
    5959int main(int argc, char **argv)
    6060{
     61    if (!MARS::CheckRootVer())
     62        return 0xff;
     63
    6164    //
    6265    // Evaluate arguments

  • trunk/MagicSoft/Mars/readraw.cc

    r7432 r8011  
    4242    gLog << "              ReadRaw - MARS V" << MARSVER          << endl;
    4343    gLog << "       MARS - Read and print raw data files"        << endl;
    44     gLog << "   Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
     44    gLog << "   Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
    4545    gLog << "==================================================" << endl;
    4646    gLog << endl;
    … …  
    7070int main(int argc, char **argv)
    7171{
     72    if (!MARS::CheckRootVer())
     73        return 0xff;
     74
    7275    // Evaluate arguments
    7376    MArgs arg(argc, argv);

  • trunk/MagicSoft/Mars/showlog.cc

    r7432 r8011  
    33
    44#include <TRegexp.h>
     5
     6#include "MAGIC.h"
    57
    68#include "MArgs.h"
    … …  
    1618    //       12345678901234567890123456789012345678901234567890
    1719    gLog << endl;
    18     gLog << "showlog --- Mars V" << MARSVER << " compiled on <" << __DATE__ << "> using ROOT v" << ROOTVER << endl;
     20    gLog << "showlog --- Mars V" << MARSVER << " compiled on <" << __DATE__ << "> using ROOT v" << ROOT_RELEASE << endl;
    1921    gLog << endl;
    2022}
    … …  
    6264int main(int argc, char **argv)
    6365{
     66    if (!MARS::CheckRootVer())
     67        return 0xff;
     68
    6469    MArgs arg(argc, argv);
    6570

  • trunk/MagicSoft/Mars/showplot.cc

    r7827 r8011  
    1818    //       12345678901234567890123456789012345678901234567890
    1919    gLog << endl;
    20     gLog << "showplot --- Mars V" << MARSVER << " compiled on <" << __DATE__ << "> using ROOT v" << ROOTVER << endl;
     20    gLog << "showplot --- Mars V" << MARSVER << " compiled on <" << __DATE__ << "> using ROOT v" << ROOT_RELEASE << endl;
    2121    gLog << endl;
    2222}
    … …  
    9090int main(int argc, char **argv)
    9191{
     92    if (!MARS::CheckRootVer())
     93        return 0xff;
     94
    9295    //
    9396    // Evaluate arguments

  • trunk/MagicSoft/Mars/sinope.cc

    r7262 r8011  
    196196    //                1         2         3         4         5
    197197    //       12345678901234567890123456789012345678901234567890
    198     gLog << "========================================================" << endl;
    199     gLog << "                  Sinope - MARS V" << MARSVER            << endl;
    200     gLog << "        MARS -- SImple Non Online Pulse Evaluation"       << endl;
    201     gLog << "               Compiled on <" << __DATE__ << ">"          << endl;
    202     gLog << "                  Using ROOT v" << ROOTVER                << endl;
    203     gLog << "========================================================" << endl;
     198    gLog << "==================================================" << endl;
     199    gLog << "            Sinope - MARS V" << MARSVER          << endl;
     200    gLog << "    MARS -- SImple Non Online Pulse Evaluation"       << endl;
     201    gLog << "   Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
     202    gLog << "==================================================" << endl;
    204203    gLog << endl;
    205204}
    … …  
    267266int main(int argc, char **argv)
    268267{
     268    if (!MARS::CheckRootVer())
     269        return 0xff;
     270
    269271    //
    270272    // Evaluate arguments

  • trunk/MagicSoft/Mars/star.cc

    r7801 r8011  
    3030    gLog << "                   Star - MARS V" << MARSVER              << endl;
    3131    gLog << "      MARS -- STandard Analysis and Reconstruction"       << endl;
    32     gLog << "     Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
     32    gLog << "     Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
    3333    gLog << "========================================================" << endl;
    3434    gLog << endl;
    … …  
    9191int main(int argc, char **argv)
    9292{
     93    if (!MARS::CheckRootVer())
     94        return 0xff;
     95
    9396    //
    9497    // Evaluate arguments
Note: See TracChangeset for help on using the changeset viewer.