Changeset 6252 for trunk


Ignore:
Timestamp:
02/04/05 13:26:11 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r6250 r6252  
    2121                                                 -*-*- END OF LINE -*-*-
    2222
     23 2005/02/04 Thomas Bretz
     24
     25   * Makefile.rules:
     26     - fixed creation of main MDep.d
     27
     28   * callisto.cc, merpp.cc, showlog.cc, showplot.cc, star.cc:
     29     - added commandline option --version
     30
     31   * mbase/MFilter.cc:
     32     - changed default for 'GetRule'
     33
     34   * mbase/MParContainer.cc:
     35     - simplified GetNewObject
     36
     37   * mfbase/MF.cc:
     38     - if no conditional sign is found try to create
     39       MFilter-object
     40
     41   * mraw/MRawEvtData.cc:
     42     - fixed the initialization of fABFlags in case maxid==0 which
     43       is the default. This caused MRawEvtPixelIter::HasABFlag
     44       to do unallowed access to memory for old root-files without
     45       the AB flag, because it assumed (due to size==1) that the
     46       data contains the ab flag
     47
     48   * mraw/MRawEvtPixelIter.[h,cc]:
     49     - removed some obsolete debug comments
     50     - simplified HasABFlag
     51
     52
     53
    2354 2005/02/04 Abelardo Moralejo
    2455
    2556   * macros/starmc2.C
    2657     - added to output missing container MConcentration.
     58
    2759
    2860
     
    6597   * mraw/MRawEvtHeader.h
    6698     - introduced Setter() of cal. pattern for Abelardo
     99
    67100
    68101
  • trunk/MagicSoft/Mars/Makefile.rules

    r4020 r6252  
    2525%.d:   
    2626        @echo " - Generating dependencies" $@
    27         $(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) 2> /dev/null | \
     27        $(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) -- $(PROGRAMS:=.cc) 2> /dev/null | \
    2828         sed 's/^\(.*\).o:/$@ \1.o:/' > $@
    2929        echo "$@: Makefile" >> $@
  • trunk/MagicSoft/Mars/NEWS

    r6208 r6252  
    22 *** Version <cvs>
    33   
    4    - Kalibration is now done autmatically into equiv. photo-electrons like
    5      decided by the CB.
     4   - Calibration is now done autmatically into equiv. photo-electrons like
     5     decided by the Collaboration Board
    66 
    7    - Reference lines in the display can be read from conf. file
    8 
    9    - Interlaced cal. events are now handled correctly by callisto.
    10 
    11    - High-Gain vs. Low-Gain calibration constants can be calculated (but not
    12      yet applied) in callisto.
     7   - Reference lines in the display can be read from resource file
     8
     9   - Interlaced calibration events can be handled by callisto
     10
     11   - High-Gain vs. Low-Gain calibration constants can be calculated
     12     (but not yet applied) in callisto.
    1313
    1414   - class MJCalibTest can be called by callisto
    1515
    16    - interpolated pointing positions are now in Tree "Events" after calibration
     16   - interpolated pointing positions are now in Tree "Events" after
     17     calibration
    1718
    1819   - callisto can now run with three data types: rawdata, rootdata, MC
     
    2122     mreport/MReportStarguider.h for implementing starguider-data
    2223     
    23    - For implementing the starguider-data the class MReportStarguider has
    24      been added to mreport/ReportLinkDef.h and to mreport/Makefile
    25      
    26    - added two containers ( MReportStarguider, MTimeStarguider ) and
    27      added MReportStarguider to the list in merpp.cc
     24   - the output of merpp-update now contains starguider information:
     25     MReportStarguider and MTimeStarguider
    2826   
    2927   - Fixed bug in MHHadronness.cc which made that the displayed Q-factor
     
    3129     energy (Size) events.
    3230
    33    - Made MExtractTimeAndChargeDigital Filter the default for callisto
     31   - Made MExtractTimeAndChargeDigitalFilter the default for callisto
    3432
    3533   - added a new loop to callisto to support the correct extraction of
     
    4644     small pixels, example: extendcam.C
    4745
    48    - added possibility to write data to memory (TTree) using MReadTree
     46   - added possibility to write data to memory (TTree) using MWriteRootFile
    4947
    5048   - added possibility to read a TTree stored only in memory by MReadTree
     
    6361       with the signal extractor with randomization (extraction window is
    6462       randomly fixed)
    65      The thir kind of pedestal is not yet implemented (for speed reasons) as
     63     The three kind of pedestal is not yet implemented (for speed reasons) as
    6664     long as nobody really needs it:
    6765     + pedestal from extractor with randomizatiuon (MPedPhotFromExtractorRndm):
     
    7674      batch mode possible:
    7775      showplot -b --save-as-ps[=outfile.ps] infile.root
     76
     77    - Allow class names as part of filter rules, eg
     78      (MFSupercuts) && (MHillas.fSize>100)
    7879
    7980
  • trunk/MagicSoft/Mars/callisto.cc

    r6229 r6252  
    5959    gLog << "   -q                        Quit when job is finished" << endl;
    6060    gLog << "   -f                        Force overwrite of existing files" << endl;
    61     //gLog << "   -ff                       Force execution if not all files found" << endl;
    6261    gLog << "   --ind=path                Path where to search for the data files" << endl;
    6362    gLog << "                             [default=standard path in datacenter]" << endl;
     
    7675    gLog << "   --config=callisto.rc      Resource file [default=callisto.rc]" << endl;
    7776    gLog << endl;
     77    gLog << "   --version, -V             Show startup message with version number" << endl;
    7878    gLog << "   -?, -h, --help            This help" << endl << endl;
    7979    gLog << " Setup of the two jobs run by callisto (MJPedestal and MJCalibration)" << endl;
     
    106106    MArgs arg(argc, argv, kTRUE);
    107107
     108    if (arg.HasOnly("-V") || arg.HasOnly("--version"))
     109        return 0;
     110
    108111    if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))
    109112    {
Note: See TracChangeset for help on using the changeset viewer.