Changeset 1081 for trunk/MagicSoft


Ignore:
Timestamp:
11/15/01 11:24:06 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc

    r1048 r1081  
    1616!
    1717!
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1819!   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    19 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
    2020!
    2121!   Copyright: MAGIC Software Development, 2000-2001

  • trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

    r1051 r1081  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2001

  • trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

    r1051 r1081  
    1616!
    1717!
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1819!   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    19 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
    2020!
    2121!   Copyright: MAGIC Software Development, 2000-2001
    … …  
    8484    const Int_t entries = fPixels->GetEntries();
    8585
    86     *fLog << "MCerPhotEvt::Print()" << endl
    87         << "Number of Pixels: " << fNumPixels
    88         << "(" << entries << ")"
    89         << endl ;
     86    *fLog << GetDescriptor() << dec << endl;
     87    *fLog << " Number of Pixels: " << fNumPixels << "(" << entries << ")" << endl;
    9088
    9189    for (Int_t i=0; i<entries; i++ )

  • trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

    r991 r1081  
    1616!
    1717!
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1819!   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    19 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
    2020!
    2121!   Copyright: MAGIC Software Development, 2000-2001
    … …  
    5858void MCerPhotPix::Print(Option_t *) const
    5959{
    60     gLog << "MCerPhotPix: Pixel: "<< fPixId ;
    61 
     60    gLog << GetDescriptor() <<" Pixel: "<< fPixId;
    6261    gLog << (fIsUsed?"    Used ":"  Unused ");
    63 
    6462    gLog << (fIsCore?"  Core  ":"        ");
    65 
    66     gLog << "  Nphot= " << fPhot
    67         << "  Error(Nphot) = " << fErrPhot
    68         << endl ;
     63    gLog << "  Nphot= " << fPhot << "  Error(Nphot) = " << fErrPhot << endl;
    6964}
    7065

  • trunk/MagicSoft/Mars/manalysis/MHillas.cc

    r1077 r1081  
    1616!
    1717!
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1819!   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    19 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
    2020!
    2121!   Copyright: MAGIC Software Development, 2000-2001

  • trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc

    r1003 r1081  
    1616!
    1717!
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1819!   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    19 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
    2020!
    2121!   Copyright: MAGIC Software Development, 2000-2001

  • trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

    r1076 r1081  
    1616!
    1717!
     18!   Author(s): Thomas Bretz    12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1819!   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    19 !   Author(s): Thomas Bretz    12/2000 (tbretz@uni-sw.gwdg.de)
    2020!
    2121!   Copyright: MAGIC Software Development, 2000-2001
    … …  
    4242/////////////////////////////////////////////////////////////////////////////
    4343#include "MImgCleanStd.h"
     44
     45#include <stdlib.h>       // atof
     46
     47#include <TGFrame.h>      // TGFrame
     48#include <TGLabel.h>      // TGLabel
     49#include <TGTextEntry.h>  // TGTextEntry
    4450
    4551#include "MLog.h"
    … …  
    5258#include "MCerPhotEvt.h"
    5359
     60#include "MGGroupFrame.h" // MGGroupFrame
     61
    5462ClassImp(MImgCleanStd);
     63
     64enum {
     65    kImgCleanLvl1,
     66    kImgCleanLvl2
     67};
    5568
    5669// --------------------------------------------------------------------------
    … …  
    6780    fTitle = title ? title : "Task which does a standard image cleaning";
    6881
    69     *fLog << "Cleaning initialized. Using noise level " << lvl1 << " and " << lvl2 << endl;
     82    Print();
    7083}
    7184
    … …  
    273286}
    274287
    275 #include <stdlib.h>       // atof
    276 
    277 #include <TGFrame.h>      // TGFrame
    278 #include <TGLabel.h>      // TGLabel
    279 #include <TGTextEntry.h>  // TGTextEntry
    280 
    281 #include "MGGroupFrame.h" // MGGroupFrame
    282 
    283 enum {
    284     kImgCleanLvl1,
    285     kImgCleanLvl2
    286 };
    287 
     288// --------------------------------------------------------------------------
     289//
     290//  Print descriptor and cleaning levels.
     291//
     292void MImgCleanStd::Print(Option_t *o) const
     293{
     294    *fLog << GetDescriptor() << " initialized with noise level ";
     295    *fLog << fCleanLvl1 << " and " << fCleanLvl2 << endl;
     296}
     297
     298// --------------------------------------------------------------------------
     299//
     300//  Craete two text entry fields, one for each cleaning level and a
     301//  describing text line.
     302//
    288303void MImgCleanStd::CreateGuiElements(MGGroupFrame *f)
    289304{
    … …  
    315330    entry2->Associate(f);
    316331
    317     TGLabel *l1 = new TGLabel(f1, "Cleaning Level 1 for standard image cleaning.");
    318     TGLabel *l2 = new TGLabel(f2, "Cleaning Level 2 for standard image cleaning.");
     332    TGLabel *l1 = new TGLabel(f1, "Cleaning Level 1");
     333    TGLabel *l2 = new TGLabel(f2, "Cleaning Level 2");
    319334
    320335    l1->SetTextJustify(kTextLeft);
    … …  
    348363}
    349364
     365// --------------------------------------------------------------------------
     366//
     367//  Process the GUI Events comming from the two text entry fields.
     368//
    350369Bool_t MImgCleanStd::ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2)
    351370{

  • trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

    r1051 r1081  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2001
    … …  
    8484    pedcam->InitSize(num);
    8585
     86    *fLog << "Pixels: " << num << endl;
     87
    8688    for (int i=0; i<num; i++)
    8789    {

  • trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc

    r1051 r1081  
    1616!
    1717!
    18 !   Author(s): Josep Flix 04/2001 (jflix@ifae.es)
    19 !              Thomas Bretz 05/2001 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Josep Flix 04/2001 <mailto:jflix@ifae.es>
     19!   Author(s): Thomas Bretz 05/2001 <mailto:tbretz@uni-sw.gwdg.de>
    2020!
    2121!   Copyright: MAGIC Software Development, 2000-2001

  • trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

    r1052 r1081  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2001

  • trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc

    r857 r1081  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2001

  • trunk/MagicSoft/Mars/mdatacheck/MDumpEvtHeader.cc

    r959 r1081  
    1616!
    1717!
    18 !   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    19 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
     19!   Author(s): Harald Kornmayer 1/2001
    2020!
    2121!   Copyright: MAGIC Software Development, 2000-2001
    … …  
    6363    if (!fRawEvtHeader)
    6464    {
    65         *fLog << dbginf << " Error: MRawEvtHeader not found... exit." << endl;
     65        *fLog << err << dbginf << "- Error: MRawEvtHeader not found... exit." << endl;
    6666        return kFALSE;
    6767    }
    … …  
    7070    if (!fRawEvtData)
    7171    {
    72         *fLog << dbginf << " Error: MRawEvtData not found... exit." << endl;
     72        *fLog << err << dbginf << "- Error: MRawEvtData not found... exit." << endl;
    7373        return kFALSE;
    7474    }
    … …  
    8686    fRawEvtHeader->Print();
    8787
     88    *fLog << all;
     89
    8890    MRawEvtPixelIter pixel(fRawEvtData);
    8991

  • trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc

    r1030 r1081  
    1616!
    1717!
    18 !   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
    19 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
     19!   Author(s): Harald Kornmayer 1/2001
    2020!
    2121!   Copyright: MAGIC Software Development, 2000-2001

  • trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

    r1057 r1081  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  10/2001 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Thomas Bretz  10/2001 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2001
    … …  
    3030#include <TGButtonGroup.h>  // TGVButtonGroup
    3131
     32#include "MGTask.h"         // MGTask::CreateGui
    3233#include "MClone.h"         // MClone
    3334#include "MHillas.h"        // MHillas
    … …  
    6061    // Create gui elements for vertical frame
    6162    //
    62     TGVButtonGroup *group = new TGVButtonGroup(fTab1);
     63    TGGroupFrame *grp = new TGGroupFrame(fTab1, "Display");
     64    TGVButtonGroup *group = new TGVButtonGroup(grp);
    6365    fList->Add(group);
    6466
    6567    TGRadioButton *but1 = new TGRadioButton(group, "Raw Events",      kRButRawEvt);
    6668    TGRadioButton *but2 = new TGRadioButton(group, "Cleaned Events",  kRButCleanedEvt);
    67     TGCheckButton *but3 = new TGCheckButton(fTab1, "Display Ellipse", kCButHillas);
     69    TGCheckButton *but3 = new TGCheckButton(grp,  "Display Ellipse", kCButHillas);
    6870
    6971    but2->SetState(kButtonDown);
    … …  
    9193    fList->Add(laybut);
    9294
    93     fTab1->AddFrame(group);
    94     fTab1->AddFrame(but3, laybut);
     95    grp->AddFrame(group);
     96    grp->AddFrame(but3, laybut);
     97
     98    TGLayoutHints *laygrp1 = new TGLayoutHints(kLHintsNormal|kLHintsExpandX, 10, 10, 5, 0);
     99    TGLayoutHints *laygrp2 = new TGLayoutHints(kLHintsNormal|kLHintsExpandX, 10, 10, 5, 5);
     100
     101    fTab1->AddFrame(grp, laygrp1);
     102    ((MGTask*)GetTaskList()->FindObject("MImgCleanStd"))->CreateGui(fTab1, laygrp2);
    95103}
    96104

  • trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

    r1052 r1081  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  10/2001 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Thomas Bretz  10/2001 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2001
    … …  
    467467    static TString dir(".");
    468468
    469     TGFileInfo fi;
     469    TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo
    470470
    471471    fi.fFileTypes = gSaveAsTypes;

  • trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc

    r1052 r1081  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  10/2001 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Thomas Bretz  10/2001 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2001

  • trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.cc

    r856 r1081  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  07/2001 (tbretz@uni-sw.gwdg.de)
     18!   Author(s): Thomas Bretz  07/2001 <mailto:tbretz@uni-sw.gwdg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2001
    … …  
    4545{
    4646    fContName = cname;
     47    Init(type, val);
    4748}
    4849
    … …  
    5152MFTriggerLvl1::MFTriggerLvl1(const MMcTrig *mctrig, const char type, const Int_t val) : fMcTrig(mctrig)
    5253{
     54    Init(type, val);
    5355}
    5456
    … …  
    6062
    6163    if (type!='<' && type!='>')
    62         *fLog << dbginf << "Warning: Neither '<' nor '>' specified... using '>'." << endl;
     64        *fLog << warn << dbginf << "Warning: Neither '<' nor '>' specified... using '>'." << endl;
    6365
    6466    fValue = val;
     67
     68    AddToBranchList("fNumFirstLevel");
    6569}
    6670
    … …  
    8387        return kTRUE;
    8488
    85     *fLog << dbginf << fContName << " [MMcTrig] not found... aborting." << endl;
     89    *fLog << err << dbginf << fContName << " [MMcTrig] not found... aborting." << endl;
    8690        return kFALSE;
    8791}
Note: See TracChangeset for help on using the changeset viewer.