Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 4451) +++ /trunk/MagicSoft/Mars/Changelog (revision 4452) @@ -46,6 +46,6 @@ - fixed some errors in the documentation - changed ClassDef to 1 - - changed the new algorithms such that any number of different pixel- - sizes are supported + - changed the new algorithms such that any number of different + pixel-sizes are supported - small modifications to the sanity checks Index: /trunk/MagicSoft/Mars/manalysis/MCameraData.h =================================================================== --- /trunk/MagicSoft/Mars/manalysis/MCameraData.h (revision 4451) +++ /trunk/MagicSoft/Mars/manalysis/MCameraData.h (revision 4452) @@ -45,10 +45,4 @@ const MGeomCam &geom); -/* - void Calc(const MCerPhotEvt &evt, const MGeomCam &geom) - { - CalcCleaningLevel(evt, 1, geom); - } - */ const TArrayD &GetData() const { return fData; } const TArrayC &GetValidity() const { return fValidity; } @@ -59,5 +53,5 @@ void DrawPixelContent(Int_t num) const; - ClassDef(MCameraData, 2) // class for an event containing cerenkov photons + ClassDef(MCameraData, 1) // Generalized storage class for camera data }; Index: /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h =================================================================== --- /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h (revision 4451) +++ /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h (revision 4452) @@ -56,5 +56,5 @@ b ? SETBIT(fFlags, kProcessRMS) : CLRBIT(fFlags, kProcessRMS); } - void SetNumMinNeighbors(UShort_t num) { fNumMinNeighbors=num; } + void SetNumMinNeighbors(Byte_t num) { fNumMinNeighbors=num; } Index: /trunk/MagicSoft/Mars/mbase/MArgs.cc =================================================================== --- /trunk/MagicSoft/Mars/mbase/MArgs.cc (revision 4451) +++ /trunk/MagicSoft/Mars/mbase/MArgs.cc (revision 4452) @@ -18,5 +18,5 @@ ! Author(s): Thomas Bretz, 7/2003 ! -! Copyright: MAGIC Software Development, 2003 +! Copyright: MAGIC Software Development, 2003-2004 ! ! Index: /trunk/MagicSoft/Mars/mbase/MEvtLoop.cc =================================================================== --- /trunk/MagicSoft/Mars/mbase/MEvtLoop.cc (revision 4451) +++ /trunk/MagicSoft/Mars/mbase/MEvtLoop.cc (revision 4452) @@ -952,4 +952,6 @@ } + fLog->ReadEnv(env, prefix, print); + return kTRUE; } @@ -1003,4 +1005,6 @@ } + fLog->WriteEnv(env, prefix, print); + return kTRUE; } Index: /trunk/MagicSoft/Mars/mbase/MLog.cc =================================================================== --- /trunk/MagicSoft/Mars/mbase/MLog.cc (revision 4451) +++ /trunk/MagicSoft/Mars/mbase/MLog.cc (revision 4452) @@ -108,4 +108,6 @@ #include "MLogPlugin.h" +#include "MParContainer.h" +#include "MArgs.h" ClassImp(MLog); @@ -509,4 +511,76 @@ // -------------------------------------------------------------------------- // +// Setup MLog and global debug output from command line arguments. +// +// gLog << " -v# Verbosity level # [default=2]" << endl; +// gLog << " -a, --no-colors Do not use Ansii color codes" << endl; +// gLog << " --debug[=n] Enable root debugging (Default: gDebug=1)" << endl; +// +void MLog::Setup(MArgs &arg) +{ + if (arg.HasOnlyAndRemove("--no-colors") || arg.HasOnlyAndRemove("-a")) + SetNoColors(); + + SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2); + + gDebug = arg.HasOption("--debug=") ? arg.GetIntAndRemove("--debug=") : 0; + if (gDebug==0 && arg.HasOnlyAndRemove("--debug")) + gDebug=1; +} + +// -------------------------------------------------------------------------- +// +// Read the setup from a TEnv: +// MLog.VerbosityLevel: 0, 1, 2, 3, 4 +// MLog.DebugLevel: 0, 1, 2, 3, 4 +// MLog.NoColors +// +// Depending on your setup it might be correct to use something like: +// Job1.MLog.VerbosityLevel: 1 +// Job1.DebugLevel: 2 +// Job1.MLog.NoColors +// +void MLog::ReadEnv(const TEnv &env, TString prefix, Bool_t print) +{ + if (!prefix.IsNull()) + prefix += "."; + prefix += "MLog"; + + MParContainer mlog("MLog"); + + if (mlog.IsEnvDefined(env, prefix, "VerbosityLevel", print)) + SetDebugLevel(mlog.GetEnvValue(env, prefix, "VerbosityLevel", 2)); + + if (mlog.IsEnvDefined(env, prefix, "DebugLevel", print)) + gDebug = mlog.GetEnvValue(env, prefix, "DebugLevel", 0); + + if (mlog.IsEnvDefined(env, prefix, "NoColors", print)) + if (mlog.GetEnvValue(env, prefix, "NoColors", 1)>0) + SetNoColors(); +} + +// -------------------------------------------------------------------------- +// +// Read the setup from a TEnv: +// MLog.VerbosityLevel: 0, 1, 2, 3, 4 +// MLog.DebugLevel: 0, 1, 2, 3, 4 +// MLog.NoColors +// +// Depending on your setup it might be correct to use something like: +// Job1.MLog.VerbosityLevel: 1 +// Job1.DebugLevel: 2 +// Job1.MLog.NoColors +// +void MLog::WriteEnv(TEnv &env, TString prefix, Bool_t print) const +{ + if (!prefix.IsNull()) + prefix += "."; + prefix += "MLog"; + + cout << "MLog::WriteEnv: not yet implemented!" << endl; +} + +// -------------------------------------------------------------------------- +// // Create a new instance of an file output stream // an set the corresponding flag Index: /trunk/MagicSoft/Mars/mbase/MLog.h =================================================================== --- /trunk/MagicSoft/Mars/mbase/MLog.h (revision 4451) +++ /trunk/MagicSoft/Mars/mbase/MLog.h (revision 4452) @@ -13,4 +13,7 @@ #define bsz 160 // two standard lines +class MArgs; + +class TEnv; class TMutex; class TGTextView; @@ -181,4 +184,9 @@ void SetNoColors(Bool_t flag=kTRUE) { flag ? SetBit(eNoColors) : ResetBit(eNoColors); } + void Setup(MArgs &arg); + + void ReadEnv(const TEnv &env, TString prefix="", Bool_t print=kFALSE); + void WriteEnv(TEnv &env, TString prefix="", Bool_t print=kFALSE) const; + void Separator(TString str="", int outlvl=0) { Index: /trunk/MagicSoft/Mars/mbase/MTaskInteractive.cc =================================================================== --- /trunk/MagicSoft/Mars/mbase/MTaskInteractive.cc (revision 4451) +++ /trunk/MagicSoft/Mars/mbase/MTaskInteractive.cc (revision 4452) @@ -34,4 +34,20 @@ // This is a simple way to develop new code in a macro without need // to compile it. +// +// Example: +// Int_t Process() +// { +// gLog << "Processing..." << endl; +// return kTRUE; +// } +// +// void main() +// { +// MTaskInteractive task; +// task.SetProcess(Process); +// MTaskList list; +// list.AddToList(&task); +// } +// // // Input Containers: Index: /trunk/MagicSoft/Mars/mbase/MTaskInteractive.h =================================================================== --- /trunk/MagicSoft/Mars/mbase/MTaskInteractive.h (revision 4451) +++ /trunk/MagicSoft/Mars/mbase/MTaskInteractive.h (revision 4452) @@ -1,13 +1,4 @@ #ifndef MARS_MTaskInteractive #define MARS_MTaskInteractive - -///////////////////////////////////////////////////////////////////////////// -// // -// MTaskInteractive // -// // -// Does nothing than return kCONTINUE in the Process-fucntion // -// (use with filters) // -// // -///////////////////////////////////////////////////////////////////////////// #ifndef MARS_MTask Index: /trunk/MagicSoft/Mars/mbase/MTime.cc =================================================================== --- /trunk/MagicSoft/Mars/mbase/MTime.cc (revision 4451) +++ /trunk/MagicSoft/Mars/mbase/MTime.cc (revision 4452) @@ -157,4 +157,8 @@ // strange offsets. You can get rid of this by calling: // TAxis::SetTimeFormat("[your-format] %F1995-01-01 00:00:00"); +// +// Be carefull: It seems that root takes sommer and winter time into account! +// In some circumstances you may need +// TAxis::SetTimeFormat("[your-format] %F1995-01-00 23:00:00"); // Double_t MTime::GetAxisTime() const Index: /trunk/MagicSoft/Mars/merpp.cc =================================================================== --- /trunk/MagicSoft/Mars/merpp.cc (revision 4451) +++ /trunk/MagicSoft/Mars/merpp.cc (revision 4452) @@ -116,6 +116,5 @@ } - if (arg.HasOnlyAndRemove("--no-colors") || arg.HasOnlyAndRemove("-a")) - gLog.SetNoColors(); + gLog.Setup(arg); const Int_t kComprlvl = arg.HasOption("-c") ? arg.GetIntAndRemove("-c") : 2; @@ -124,10 +123,4 @@ const Bool_t kForce = arg.HasOnlyAndRemove("-f"); const Bool_t kForceProc = arg.HasOnlyAndRemove("-ff"); - - gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2); - - gDebug = arg.HasOption("--debug=") ? arg.GetIntAndRemove("--debug=") : 0; - if (gDebug==0 && arg.HasOnlyAndRemove("--debug")) - gDebug=1; MTime kTimeStart; @@ -145,4 +138,11 @@ if (kTimeStop) gLog << inf << "Stop Time: " << kTimeStop << endl; + + if (arg.GetNumOptions()>0) + { + gLog << warn << "WARNING - Unknown commandline options..." << endl; + arg.Print("options"); + gLog << endl; + } // Index: /trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc =================================================================== --- /trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc (revision 4451) +++ /trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc (revision 4452) @@ -128,4 +128,5 @@ // the terms commonly used in the class. // +// // STANDARD CLEANING: // ================= @@ -165,10 +166,10 @@ // // add the image cleaning to the main task list // +// // DEMOCRATIC CLEANING: // =================== // You use this cleaning method when you want to compare the number of -// photo-electons of each pixel with the average pedestal RMS -// (fInnerNoise = fSgb->GetSigmabarInner()) of the inner pixels (for the -// MAGIC camera they are the smaller ones): +// photo-electons of each pixel with the average pedestal RMS of the +// inner pixels (for the MAGIC camera they are the smaller ones): //Begin_Html //       @@ -178,17 +179,8 @@ // have a different area) are compared to the same pedestal RMS, coming // from the inner pixels. -// To calculate the average pedestal RMS of the inner pixels, you have to -// add to the main task list an object of type MSigmabarCalc before the -// MImgCleanStd object. To know how the calculation of fInnerNoise is done -// look at the MSigmabarCalc Class. -// -// Example: -// -// MSigmabarCalc sbcalc; -// //creates an object that calcutates the average pedestal RMS -// MImgCleanStd clean; -// ... -// tlist.AddToList(&sbcalc); -// tlist.AddToList(&clean); +// +// Make sure that you used a class calculating the MPedPhotCam which also +// updated the contents of the mean values (Recalc) correctly. +// // // Member Function: SetMethod() @@ -206,4 +198,5 @@ // clean.SetMethod(MImgCleanStd::kDemocratic); // //now the method of cleaning is changed to Democratic +// // // FIRST AND SECOND CLEANING LEVEL @@ -245,6 +238,6 @@ // Input Containers: // MGeomCam +// MPedPhotCam // MCerPhotEvt -// [MSigmabar] // // Output Containers: @@ -265,5 +258,4 @@ #include "MParList.h" -#include "MSigmabar.h" #include "MCameraData.h" @@ -298,5 +290,5 @@ MImgCleanStd::MImgCleanStd(const Float_t lvl1, const Float_t lvl2, const char *name, const char *title) - : fSgb(NULL), fCleaningMethod(kStandard), fCleanLvl1(lvl1), + : fCleaningMethod(kStandard), fCleanLvl1(lvl1), fCleanLvl2(lvl2), fCleanRings(1) @@ -358,5 +350,5 @@ while ((pix=static_cast(Next()))) - { + { // get pixel id of this entry const Int_t idx = pix->GetPixId(); @@ -391,7 +383,8 @@ Next.Reset(); while ((pix=static_cast(Next()))) - { - if ( pix->IsPixelUsed()) - pix->SetPixelCore();} + { + if (pix->IsPixelUsed()) + pix->SetPixelCore(); + } } @@ -434,7 +427,5 @@ // if (pix.GetRing() != 0) - { - return; - } + return; // @@ -480,26 +471,18 @@ MCerPhotEvtIter NextAll(fEvt, kFALSE); while ((pix=static_cast(NextAll()))) - { + { // // if pixel is a core pixel or unmapped, go to the next pixel // - if (pix->IsPixelCore()) - { - continue;} - if (pix->IsPixelUnmapped()) - { - continue;} - - if (data[pix->GetPixId()] <= fCleanLvl2) - { - continue;} - - if (r==1) - { - CleanStep3b(*pix);} - else - { - CleanStep4(r, *pix);} - + if (pix->IsPixelCore() || pix->IsPixelUnmapped()) + continue; + + if (data[pix->GetPixId()] <= fCleanLvl2) + continue; + + if (r==1) + CleanStep3b(*pix); + else + CleanStep4(r, *pix); } } @@ -527,21 +510,9 @@ } - if (fCleaningMethod == kDemocratic) - { - fSgb = (MSigmabar*)pList->FindObject(AddSerialNumber("MSigmabar")); - if (!fSgb) - { - *fLog << dbginf << "MSigmabar not found... aborting." << endl; - return kFALSE; - } - } - else - { - fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam")); - if (!fPed) - { - *fLog << dbginf << "MPedPhotCam not found... aborting." << endl; - return kFALSE; - } + fPed = (MPedPhotCam*)pList->FindObject(AddSerialNumber("MPedPhotCam")); + if (!fPed) + { + *fLog << dbginf << "MPedPhotCam not found... aborting." << endl; + return kFALSE; } @@ -559,8 +530,16 @@ Int_t MImgCleanStd::Process() { - if (fSgb) - fData->CalcCleaningLevel(*fEvt, *fSgb, *fCam); - else + switch (fCleaningMethod) + { + case kStandard: fData->CalcCleaningLevel(*fEvt, *fPed, *fCam); + break; + case kScaled: + fData->CalcCleaningLevel2(*fEvt, *fPed, *fCam); + break; + case kDemocratic: + fData->CalcCleaningLevelDemocratic(*fEvt, *fPed, *fCam); + break; + } #ifdef DEBUG @@ -568,4 +547,9 @@ #endif CleanStep1(); + + // For speed reasons skip the rest of the cleaning if no + // action will be taken! + if (fCleanLvl1>=fCleanLvl2) + return kTRUE; #ifdef DEBUG @@ -599,4 +583,7 @@ *fLog << "standard"; break; + case kScaled: + *fLog << "scaled"; + break; } *fLog << " cleaning initialized with noise level " << fCleanLvl1 << " and " << fCleanLvl2; @@ -611,62 +598,62 @@ void MImgCleanStd::CreateGuiElements(MGGroupFrame *f) { - // - // Create a frame for line 3 and 4 to be able - // to align entry field and label in one line - // - TGHorizontalFrame *f1 = new TGHorizontalFrame(f, 0, 0); - TGHorizontalFrame *f2 = new TGHorizontalFrame(f, 0, 0); + // + // Create a frame for line 3 and 4 to be able + // to align entry field and label in one line + // + TGHorizontalFrame *f1 = new TGHorizontalFrame(f, 0, 0); + TGHorizontalFrame *f2 = new TGHorizontalFrame(f, 0, 0); + + /* + * --> use with root >=3.02 <-- + * + + TGNumberEntry *fNumEntry1 = new TGNumberEntry(frame, 3.0, 2, M_NENT_LVL1, kNESRealOne, kNEANonNegative); + TGNumberEntry *fNumEntry2 = new TGNumberEntry(frame, 2.5, 2, M_NENT_LVL1, kNESRealOne, kNEANonNegative); - /* - * --> use with root >=3.02 <-- - * - - TGNumberEntry *fNumEntry1 = new TGNumberEntry(frame, 3.0, 2, M_NENT_LVL1, kNESRealOne, kNEANonNegative); - TGNumberEntry *fNumEntry2 = new TGNumberEntry(frame, 2.5, 2, M_NENT_LVL1, kNESRealOne, kNEANonNegative); - - */ - TGTextEntry *entry1 = new TGTextEntry(f1, "****", kImgCleanLvl1); - TGTextEntry *entry2 = new TGTextEntry(f2, "****", kImgCleanLvl2); - - // --- doesn't work like expected (until root 3.02?) --- fNumEntry1->SetAlignment(kTextRight); - // --- doesn't work like expected (until root 3.02?) --- fNumEntry2->SetAlignment(kTextRight); - - entry1->SetText("3.0"); - entry2->SetText("2.5"); - - entry1->Associate(f); - entry2->Associate(f); - - TGLabel *l1 = new TGLabel(f1, "Cleaning Level 1"); - TGLabel *l2 = new TGLabel(f2, "Cleaning Level 2"); - - l1->SetTextJustify(kTextLeft); - l2->SetTextJustify(kTextLeft); - - // - // Align the text of the label centered, left in the row - // with a left padding of 10 - // - TGLayoutHints *laylabel = new TGLayoutHints(kLHintsCenterY|kLHintsLeft, 10); - TGLayoutHints *layframe = new TGLayoutHints(kLHintsCenterY|kLHintsLeft, 5, 0, 10); - - // - // Add one entry field and the corresponding label to each line - // - f1->AddFrame(entry1); - f2->AddFrame(entry2); - - f1->AddFrame(l1, laylabel); - f2->AddFrame(l2, laylabel); - - f->AddFrame(f1, layframe); - f->AddFrame(f2, layframe); - - f->AddToList(entry1); - f->AddToList(entry2); - f->AddToList(l1); - f->AddToList(l2); - f->AddToList(laylabel); - f->AddToList(layframe); + */ + TGTextEntry *entry1 = new TGTextEntry(f1, "****", kImgCleanLvl1); + TGTextEntry *entry2 = new TGTextEntry(f2, "****", kImgCleanLvl2); + + // --- doesn't work like expected (until root 3.02?) --- fNumEntry1->SetAlignment(kTextRight); + // --- doesn't work like expected (until root 3.02?) --- fNumEntry2->SetAlignment(kTextRight); + + entry1->SetText("3.0"); + entry2->SetText("2.5"); + + entry1->Associate(f); + entry2->Associate(f); + + TGLabel *l1 = new TGLabel(f1, "Cleaning Level 1"); + TGLabel *l2 = new TGLabel(f2, "Cleaning Level 2"); + + l1->SetTextJustify(kTextLeft); + l2->SetTextJustify(kTextLeft); + + // + // Align the text of the label centered, left in the row + // with a left padding of 10 + // + TGLayoutHints *laylabel = new TGLayoutHints(kLHintsCenterY|kLHintsLeft, 10); + TGLayoutHints *layframe = new TGLayoutHints(kLHintsCenterY|kLHintsLeft, 5, 0, 10); + + // + // Add one entry field and the corresponding label to each line + // + f1->AddFrame(entry1); + f2->AddFrame(entry2); + + f1->AddFrame(l1, laylabel); + f2->AddFrame(l2, laylabel); + + f->AddFrame(f1, layframe); + f->AddFrame(f2, layframe); + + f->AddToList(entry1); + f->AddToList(entry2); + f->AddToList(l1); + f->AddToList(l2); + f->AddToList(laylabel); + f->AddToList(layframe); } Index: /trunk/MagicSoft/Mars/mimage/MImgCleanStd.h =================================================================== --- /trunk/MagicSoft/Mars/mimage/MImgCleanStd.h (revision 4451) +++ /trunk/MagicSoft/Mars/mimage/MImgCleanStd.h (revision 4452) @@ -20,4 +20,5 @@ typedef enum { kStandard, + kScaled, kDemocratic } CleaningMethod_t; @@ -26,5 +27,4 @@ const MGeomCam *fCam; //! MCerPhotEvt *fEvt; //! - MSigmabar *fSgb; //! MPedPhotCam *fPed; //! MCameraData *fData; //! Index: /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc =================================================================== --- /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc (revision 4451) +++ /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc (revision 4452) @@ -69,5 +69,5 @@ #include "MHillasCalc.h" // MHillasCalc #include "MHillasSrcCalc.h" // MHillasSrcCalc -#include "MBlindPixelCalc.h" // MBlindPixelCalc +//#include "MBlindPixelCalc.h" // MBlindPixelCalc #include "MArrivalTimeCalc.h" // MArrivalTimeCalc #include "MFillH.h" // MFillH @@ -254,5 +254,5 @@ MFillH *fill5 = new MFillH(evt5, "MCameraData", "MFillH5"); MFillH *fill6 = new MFillH(evt6, "MCameraData", "MFillH6"); - MBlindPixelCalc *blind = new MBlindPixelCalc; +// MBlindPixelCalc *blind = new MBlindPixelCalc; MHillasCalc *hcalc = new MHillasCalc; MHillasSrcCalc *scalc = new MHillasSrcCalc; @@ -316,5 +316,5 @@ tlist->AddToList(fill5); tlist->AddToList(fill6); - tlist->AddToList(blind); +// tlist->AddToList(blind); tlist->AddToList(hcalc); tlist->AddToList(scalc);