Index: /trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc (revision 1080) +++ /trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc (revision 1080) +++ /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc (revision 1080) +++ /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -84,8 +84,6 @@ const Int_t entries = fPixels->GetEntries(); - *fLog << "MCerPhotEvt::Print()" << endl - << "Number of Pixels: " << fNumPixels - << "(" << entries << ")" - << endl ; + *fLog << GetDescriptor() << dec << endl; + *fLog << " Number of Pixels: " << fNumPixels << "(" << entries << ")" << endl; for (Int_t i=0; i ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -58,13 +58,8 @@ void MCerPhotPix::Print(Option_t *) const { - gLog << "MCerPhotPix: Pixel: "<< fPixId ; - + gLog << GetDescriptor() <<" Pixel: "<< fPixId; gLog << (fIsUsed?" Used ":" Unused "); - gLog << (fIsCore?" Core ":" "); - - gLog << " Nphot= " << fPhot - << " Error(Nphot) = " << fErrPhot - << endl ; + gLog << " Nphot= " << fPhot << " Error(Nphot) = " << fErrPhot << endl; } Index: /trunk/MagicSoft/Mars/manalysis/MHillas.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MHillas.cc (revision 1080) +++ /trunk/MagicSoft/Mars/manalysis/MHillas.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 Index: /trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc (revision 1080) +++ /trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 Index: /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc (revision 1080) +++ /trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -42,4 +42,10 @@ ///////////////////////////////////////////////////////////////////////////// #include "MImgCleanStd.h" + +#include // atof + +#include // TGFrame +#include // TGLabel +#include // TGTextEntry #include "MLog.h" @@ -52,5 +58,12 @@ #include "MCerPhotEvt.h" +#include "MGGroupFrame.h" // MGGroupFrame + ClassImp(MImgCleanStd); + +enum { + kImgCleanLvl1, + kImgCleanLvl2 +}; // -------------------------------------------------------------------------- @@ -67,5 +80,5 @@ fTitle = title ? title : "Task which does a standard image cleaning"; - *fLog << "Cleaning initialized. Using noise level " << lvl1 << " and " << lvl2 << endl; + Print(); } @@ -273,17 +286,19 @@ } -#include // atof - -#include // TGFrame -#include // TGLabel -#include // TGTextEntry - -#include "MGGroupFrame.h" // MGGroupFrame - -enum { - kImgCleanLvl1, - kImgCleanLvl2 -}; - +// -------------------------------------------------------------------------- +// +// Print descriptor and cleaning levels. +// +void MImgCleanStd::Print(Option_t *o) const +{ + *fLog << GetDescriptor() << " initialized with noise level "; + *fLog << fCleanLvl1 << " and " << fCleanLvl2 << endl; +} + +// -------------------------------------------------------------------------- +// +// Craete two text entry fields, one for each cleaning level and a +// describing text line. +// void MImgCleanStd::CreateGuiElements(MGGroupFrame *f) { @@ -315,6 +330,6 @@ entry2->Associate(f); - TGLabel *l1 = new TGLabel(f1, "Cleaning Level 1 for standard image cleaning."); - TGLabel *l2 = new TGLabel(f2, "Cleaning Level 2 for standard image cleaning."); + TGLabel *l1 = new TGLabel(f1, "Cleaning Level 1"); + TGLabel *l2 = new TGLabel(f2, "Cleaning Level 2"); l1->SetTextJustify(kTextLeft); @@ -348,4 +363,8 @@ } +// -------------------------------------------------------------------------- +// +// Process the GUI Events comming from the two text entry fields. +// Bool_t MImgCleanStd::ProcessMessage(Int_t msg, Int_t submsg, Long_t param1, Long_t param2) { Index: /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc (revision 1080) +++ /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -84,4 +84,6 @@ pedcam->InitSize(num); + *fLog << "Pixels: " << num << endl; + for (int i=0; i +! Author(s): Thomas Bretz 05/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: /trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc (revision 1080) +++ /trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: /trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc (revision 1080) +++ /trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: /trunk/MagicSoft/Mars/mdatacheck/MDumpEvtHeader.cc =================================================================== --- /trunk/MagicSoft/Mars/mdatacheck/MDumpEvtHeader.cc (revision 1080) +++ /trunk/MagicSoft/Mars/mdatacheck/MDumpEvtHeader.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! -! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 +! Author(s): Harald Kornmayer 1/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -63,5 +63,5 @@ if (!fRawEvtHeader) { - *fLog << dbginf << " Error: MRawEvtHeader not found... exit." << endl; + *fLog << err << dbginf << "- Error: MRawEvtHeader not found... exit." << endl; return kFALSE; } @@ -70,5 +70,5 @@ if (!fRawEvtData) { - *fLog << dbginf << " Error: MRawEvtData not found... exit." << endl; + *fLog << err << dbginf << "- Error: MRawEvtData not found... exit." << endl; return kFALSE; } @@ -86,4 +86,6 @@ fRawEvtHeader->Print(); + *fLog << all; + MRawEvtPixelIter pixel(fRawEvtData); Index: /trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc =================================================================== --- /trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc (revision 1080) +++ /trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc (revision 1081) @@ -16,6 +16,6 @@ ! ! -! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 12/2000 +! Author(s): Harald Kornmayer 1/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: /trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc =================================================================== --- /trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc (revision 1080) +++ /trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 10/2001 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 10/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -30,4 +30,5 @@ #include // TGVButtonGroup +#include "MGTask.h" // MGTask::CreateGui #include "MClone.h" // MClone #include "MHillas.h" // MHillas @@ -60,10 +61,11 @@ // Create gui elements for vertical frame // - TGVButtonGroup *group = new TGVButtonGroup(fTab1); + TGGroupFrame *grp = new TGGroupFrame(fTab1, "Display"); + TGVButtonGroup *group = new TGVButtonGroup(grp); fList->Add(group); TGRadioButton *but1 = new TGRadioButton(group, "Raw Events", kRButRawEvt); TGRadioButton *but2 = new TGRadioButton(group, "Cleaned Events", kRButCleanedEvt); - TGCheckButton *but3 = new TGCheckButton(fTab1, "Display Ellipse", kCButHillas); + TGCheckButton *but3 = new TGCheckButton(grp, "Display Ellipse", kCButHillas); but2->SetState(kButtonDown); @@ -91,6 +93,12 @@ fList->Add(laybut); - fTab1->AddFrame(group); - fTab1->AddFrame(but3, laybut); + grp->AddFrame(group); + grp->AddFrame(but3, laybut); + + TGLayoutHints *laygrp1 = new TGLayoutHints(kLHintsNormal|kLHintsExpandX, 10, 10, 5, 0); + TGLayoutHints *laygrp2 = new TGLayoutHints(kLHintsNormal|kLHintsExpandX, 10, 10, 5, 5); + + fTab1->AddFrame(grp, laygrp1); + ((MGTask*)GetTaskList()->FindObject("MImgCleanStd"))->CreateGui(fTab1, laygrp2); } Index: /trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc =================================================================== --- /trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc (revision 1080) +++ /trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 10/2001 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 10/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -467,5 +467,5 @@ static TString dir("."); - TGFileInfo fi; + TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo fi.fFileTypes = gSaveAsTypes; Index: /trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc =================================================================== --- /trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc (revision 1080) +++ /trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 10/2001 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 10/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 Index: /trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.cc =================================================================== --- /trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.cc (revision 1080) +++ /trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.cc (revision 1081) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 07/2001 (tbretz@uni-sw.gwdg.de) +! Author(s): Thomas Bretz 07/2001 ! ! Copyright: MAGIC Software Development, 2000-2001 @@ -45,4 +45,5 @@ { fContName = cname; + Init(type, val); } @@ -51,4 +52,5 @@ MFTriggerLvl1::MFTriggerLvl1(const MMcTrig *mctrig, const char type, const Int_t val) : fMcTrig(mctrig) { + Init(type, val); } @@ -60,7 +62,9 @@ if (type!='<' && type!='>') - *fLog << dbginf << "Warning: Neither '<' nor '>' specified... using '>'." << endl; + *fLog << warn << dbginf << "Warning: Neither '<' nor '>' specified... using '>'." << endl; fValue = val; + + AddToBranchList("fNumFirstLevel"); } @@ -83,5 +87,5 @@ return kTRUE; - *fLog << dbginf << fContName << " [MMcTrig] not found... aborting." << endl; + *fLog << err << dbginf << fContName << " [MMcTrig] not found... aborting." << endl; return kFALSE; }