Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 1286) +++ trunk/MagicSoft/Mars/Changelog (revision 1287) @@ -1,3 +1,12 @@ -*-*- END -*-*- + 2002/04/23: Thomas Bretz + + * madata/Makefile, mdata/DataIncl.h, mdata/DataLinkDef.h, + mdata/MData.[h,cc], mdata/MDataValue.[h,cc], mdata/MDataList.[h,cc], + mdata/MDataChain.[h,cc], mdata/MDataMember.[h,cc]: + - added + + + 2002/04/22: Thomas Bretz Index: trunk/MagicSoft/Mars/mdata/DataIncl.h =================================================================== --- trunk/MagicSoft/Mars/mdata/DataIncl.h (revision 1287) +++ trunk/MagicSoft/Mars/mdata/DataIncl.h (revision 1287) @@ -0,0 +1,10 @@ +#ifndef __CINT__ + +#include + +#include +#include + +#include + +#endif // __CINT__ Index: trunk/MagicSoft/Mars/mdata/DataLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mdata/DataLinkDef.h (revision 1287) +++ trunk/MagicSoft/Mars/mdata/DataLinkDef.h (revision 1287) @@ -0,0 +1,13 @@ +#ifdef __CINT__ + +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +#pragma link C++ class MData+; +#pragma link C++ class MDataList+; +#pragma link C++ class MDataValue+; +#pragma link C++ class MDataMember+; +#pragma link C++ class MDataChain+; + +#endif Index: trunk/MagicSoft/Mars/mdata/MData.cc =================================================================== --- trunk/MagicSoft/Mars/mdata/MData.cc (revision 1287) +++ trunk/MagicSoft/Mars/mdata/MData.cc (revision 1287) @@ -0,0 +1,33 @@ +/* ======================================================================== *\ +! +! * +! * This file is part of MARS, the MAGIC Analysis and Reconstruction +! * Software. It is distributed to you in the hope that it can be a useful +! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. +! * It is distributed WITHOUT ANY WARRANTY. +! * +! * Permission to use, copy, modify and distribute this software and its +! * documentation for any purpose is hereby granted without fee, +! * provided that the above copyright notice appear in all copies and +! * that both that copyright notice and this permission notice appear +! * in supporting documentation. It is provided "as is" without express +! * or implied warranty. +! * +! +! +! Author(s): Thomas Bretz 04/2002 +! +! Copyright: MAGIC Software Development, 2000-2002 +! +! +\* ======================================================================== */ + +///////////////////////////////////////////////////////////////////////////// +// +// MData +// +///////////////////////////////////////////////////////////////////////////// + +#include "MData.h" + +ClassImp(MData); Index: trunk/MagicSoft/Mars/mdata/MData.h =================================================================== --- trunk/MagicSoft/Mars/mdata/MData.h (revision 1287) +++ trunk/MagicSoft/Mars/mdata/MData.h (revision 1287) @@ -0,0 +1,25 @@ +#ifndef MARS_MData +#define MARS_MData + +///////////////////////////////////////////////////////////////////////////// +// // +// MDataList // +// // +///////////////////////////////////////////////////////////////////////////// + +#ifndef MARS_MParContainer +#include "MParContainer.h" +#endif + +class MParList; + +class MData : public MParContainer +{ +public: + virtual Double_t GetValue() const = 0; + virtual Bool_t PreProcess(const MParList *plist) = 0; + + ClassDef(MData, 0) // A Filter for cuts in any data member +}; + +#endif Index: trunk/MagicSoft/Mars/mdata/MDataChain.cc =================================================================== --- trunk/MagicSoft/Mars/mdata/MDataChain.cc (revision 1287) +++ trunk/MagicSoft/Mars/mdata/MDataChain.cc (revision 1287) @@ -0,0 +1,268 @@ +/* ======================================================================== *\ +! +! * +! * This file is part of MARS, the MAGIC Analysis and Reconstruction +! * Software. It is distributed to you in the hope that it can be a useful +! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. +! * It is distributed WITHOUT ANY WARRANTY. +! * +! * Permission to use, copy, modify and distribute this software and its +! * documentation for any purpose is hereby granted without fee, +! * provided that the above copyright notice appear in all copies and +! * that both that copyright notice and this permission notice appear +! * in supporting documentation. It is provided "as is" without express +! * or implied warranty. +! * +! +! +! Author(s): Thomas Bretz 04/2002 +! +! Copyright: MAGIC Software Development, 2000-2002 +! +! +\* ======================================================================== */ + +///////////////////////////////////////////////////////////////////////////// +// +// MDataChain +// +///////////////////////////////////////////////////////////////////////////// + +#include "MDataChain.h" + +#include // isalnum, ... +#include // strtod, ... + +#include "MLog.h" +#include "MLogManip.h" + +#include "MDataList.h" +#include "MDataValue.h" +#include "MDataMember.h" +# +ClassImp(MDataChain); + +MDataChain::MDataChain(const char *rule, const char *name, const char *title) +{ + fName = name ? name : "MDataChain"; + fTitle = title ? title : "MDataChain"; + + *fLog << inf << "Trying to resolve rule..." << endl; + if (!(fMember=ParseString(rule, 1))) + { + *fLog << err << dbginf << "Parsing '" << rule << "' failed." << endl; + return; + } + + *fLog << inf << endl; + *fLog << "Using Filter rule " << fMember->GetName(); + *fLog << " for " << fName << ":" << endl; + fMember->Print(); + *fLog << endl << endl; + +} + +// -------------------------------------------------------------------------- +// +// PreProcesses all members in the list +// +Bool_t MDataChain::PreProcess(const MParList *pList) +{ + return fMember ? fMember->PreProcess(pList) : kFALSE; +} + +// -------------------------------------------------------------------------- +// +// Destructor. Delete filters. +// +MDataChain::~MDataChain() +{ + if (fMember) + delete fMember; +} + +// -------------------------------------------------------------------------- +// +// Returns the number of alphanumeric characters (including '.') +// in the given string +// +Int_t MDataChain::IsAlNum(TString txt) +{ + int l = txt.Length(); + for (int i = 0; iInheritsFrom(MDataMember::Class()) || type!=is) + { + MDataList *list = new MDataList(is); + list->SetName(Form("List_%c_%d", is, 10*level+nlist++)); + + list->SetOwner(); + list->AddToList(member0); + + member0 = list; + + type = is; + } + continue; + } + + *fLog << err << dbginf << "Syntax Error: First argument of condition missing." << endl; + if (member0) + delete member0; + return NULL; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { + char *end; + Double_t num = strtod(txt.Data(), &end); + if (!end || txt.Data()==end) + { + *fLog << err << dbginf << "Error trying to convert '" << txt << "' to value." << endl; + if (member0) + delete member0; + return NULL; + } + + txt.Remove(0, end-txt.Data()); + + newmember = new MDataValue(num); + } + break; + + default: + int i = IsAlNum(txt); + + if (i==0) + { + *fLog << err << dbginf << "Syntax Error: Name of data member missing in '" << txt << "'" << endl; + if (member0) + delete member0; + return NULL; + } + + TString text = txt(0, i); + + txt.Remove(0, i); + + // *fLog << all << "Creating: '" << text.Data() << "'" << endl; + + newmember = new MDataMember(text.Data()); + } + + if (!member0) + { + member0 = newmember; + continue; + } + + if (!member0->InheritsFrom(MDataList::Class())) + continue; + + ((MDataList*)member0)->AddToList(newmember); + } + + return member0; +} + +Double_t MDataChain::GetValue() const +{ + return fMember ? fMember->GetValue() : 0; +} Index: trunk/MagicSoft/Mars/mdata/MDataChain.h =================================================================== --- trunk/MagicSoft/Mars/mdata/MDataChain.h (revision 1287) +++ trunk/MagicSoft/Mars/mdata/MDataChain.h (revision 1287) @@ -0,0 +1,37 @@ +#ifndef MARS_MDataChain +#define MARS_MDataChain + +///////////////////////////////////////////////////////////////////////////// +// // +// MDataList // +// // +// List of several filters // +// // +///////////////////////////////////////////////////////////////////////////// + +#ifndef MARS_MData +#include "MData.h" +#endif + +class MDataChain : public MData +{ +private: + MData *fMember; // Filter + + Int_t IsAlNum(TString txt); + + MData *ParseString(TString txt, Int_t level); + +public: + MDataChain(const char *text, const char *name=NULL, const char *title=NULL); + ~MDataChain(); + + Double_t GetValue() const; + Bool_t PreProcess(const MParList *plist); + + Bool_t IsValid() const { return fMember ? kTRUE : kFALSE; } + + ClassDef(MDataChain, 0) // A Filter for cuts in any data member +}; + +#endif Index: trunk/MagicSoft/Mars/mdata/MDataList.cc =================================================================== --- trunk/MagicSoft/Mars/mdata/MDataList.cc (revision 1287) +++ trunk/MagicSoft/Mars/mdata/MDataList.cc (revision 1287) @@ -0,0 +1,239 @@ +/* ======================================================================== *\ +! +! * +! * This file is part of MARS, the MAGIC Analysis and Reconstruction +! * Software. It is distributed to you in the hope that it can be a useful +! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. +! * It is distributed WITHOUT ANY WARRANTY. +! * +! * Permission to use, copy, modify and distribute this software and its +! * documentation for any purpose is hereby granted without fee, +! * provided that the above copyright notice appear in all copies and +! * that both that copyright notice and this permission notice appear +! * in supporting documentation. It is provided "as is" without express +! * or implied warranty. +! * +! +! +! Author(s): Thomas Bretz 04/2002 +! +! Copyright: MAGIC Software Development, 2000-2002 +! +! +\* ======================================================================== */ + +///////////////////////////////////////////////////////////////////////////// +// +// MDataList +// +///////////////////////////////////////////////////////////////////////////// + +#include "MDataList.h" + +#include "MLog.h" +#include "MLogManip.h" + +ClassImp(MDataList); + +// -------------------------------------------------------------------------- +// +// Constructor. +// +// Specify the boolean operation which is used to evaluate the +// result of this list. If no operation is specified "land" is +// used. +// +// Options: +// and, & : is a bitwise and +// or, | : is a bitwise or +// xor, ^ : is a bitwise exclusive or +// land, && : is a logical and +// lor, || : is a logical or +// +MDataList::MDataList(char type) +{ + switch (type) + { + case '*': + fSign = kEMult; + return; + case '/': + fSign = kEDiv; + return; + case '-': + fSign = kEMinus; + return; + case '+': + fSign = kEPlus; + return; + default: + fSign = kENone; + } +} + +// -------------------------------------------------------------------------- +// +// CopyConstructor +// +MDataList::MDataList(MDataList &ts) +{ + fMembers.AddAll(&ts.fMembers); + fSign = ts.fSign; +} + +// -------------------------------------------------------------------------- +// +// Evaluates and returns the result of the member list. +// The expression is evaluated step by step, eg: +// ((member[0] # member[1]) # member[3]) # member[4]) +// The '#' stands for the boolean operation which is specified in +// the constructor. +// +Double_t MDataList::GetValue() const +{ + TIter Next(&fMembers); + + MData *member=(MData*)Next(); + + if (!member) + return kTRUE; + + Double_t val = member->GetValue(); + + // + // loop over all members + // + switch (fSign) + { + case kENone: + return 0; + + case kEPlus: + while ((member=(MData*)Next())) + val += member->GetValue(); + break; + + case kEMinus: + while ((member=(MData*)Next())) + val -= member->GetValue(); + break; + + case kEMult: + while ((member=(MData*)Next())) + val *= member->GetValue(); + break; + + case kEDiv: + while ((member=(MData*)Next())) + { + Double_t d = member->GetValue(); + if (d==0) + { + *fLog << warn << "Warning: Division by zero (" << member->GetName() << ")" << endl; + return 0; + } + val /= d; + } + break; + } + return val; +} + +// -------------------------------------------------------------------------- +// +// If you want to add a new member to the list call this function with the +// pointer to the member to be added. +// +Bool_t MDataList::AddToList(MData *member) +{ + if (!member) + return kTRUE; + + if (fMembers.FindObject(member)) + { + *fLog << warn << dbginf << "Filter already existing... skipped." << endl; + return kTRUE; + } + + fMembers.Add(member); + + *fLog << "Done." << endl; + + return kTRUE; +} + +Bool_t MDataList::PreProcess(const MParList *plist) +{ + TIter Next(&fMembers); + + MData *member=NULL; + + // + // loop over all members + // + while ((member=(MData*)Next())) + if (!member->PreProcess(plist)) + { + *fLog << err << "Error - Preprocessing Data Member "; + *fLog << member->GetName() << " in " << fName << endl; + return kFALSE; + } + + return kTRUE; +} + + +// -------------------------------------------------------------------------- +// +// If you want to use a verbose output ("and") instead of a symbolic ("&") +// one the option string must conatin a "v" +// +void MDataList::Print(Option_t *opt) const +{ + *fLog << all << "("; + + TIter Next(&fMembers); + + TObject *member=Next(); + + // + // loop over all members + // + if (!member) + { + *fLog << ")" << flush; + return; + } + + member->Print(); + + while ((member=Next())) + { + switch (fSign) + { + case kENone: + break; + + case kEPlus: + *fLog << "+"; + break; + + case kEMinus: + *fLog << "-"; + break; + + case kEMult: + *fLog << "*"; + break; + + case kEDiv: + *fLog << "/"; + break; + } + + member->Print(); + } + + *fLog << ")" << flush; +} + Index: trunk/MagicSoft/Mars/mdata/MDataList.h =================================================================== --- trunk/MagicSoft/Mars/mdata/MDataList.h (revision 1287) +++ trunk/MagicSoft/Mars/mdata/MDataList.h (revision 1287) @@ -0,0 +1,50 @@ +#ifndef MARS_MDataList +#define MARS_MDataList + +///////////////////////////////////////////////////////////////////////////// +// // +// MDataList // +// // +///////////////////////////////////////////////////////////////////////////// + +#ifndef ROOT_TOrdCollection +#include +#endif + +#ifndef MARS_MData +#include "MData.h" +#endif + +class MParList; + +class MDataList : public MData +{ +private: + TOrdCollection fMembers; // Container for the filters + + typedef enum { kENone, kEPlus, kEMinus, kEMult, kEDiv } SignType_t; + SignType_t fSign; + + enum { kIsOwner = BIT(14) }; + +public: + MDataList(char type); + MDataList(MDataList &ts); + ~MDataList() + { + if (TestBit(kIsOwner)) + fMembers.SetOwner(); + } + + Bool_t AddToList(MData *member); + void SetOwner(Bool_t enable=kTRUE) { enable ? SetBit(kIsOwner) : ResetBit(kIsOwner); } + + Double_t GetValue() const; + Bool_t PreProcess(const MParList *plist); + + void Print(Option_t *opt = "") const; + + ClassDef(MDataList, 0) // List to combine several filters logically +}; + +#endif Index: trunk/MagicSoft/Mars/mdata/MDataMember.cc =================================================================== --- trunk/MagicSoft/Mars/mdata/MDataMember.cc (revision 1287) +++ trunk/MagicSoft/Mars/mdata/MDataMember.cc (revision 1287) @@ -0,0 +1,104 @@ +/* ======================================================================== *\ +! +! * +! * This file is part of MARS, the MAGIC Analysis and Reconstruction +! * Software. It is distributed to you in the hope that it can be a useful +! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. +! * It is distributed WITHOUT ANY WARRANTY. +! * +! * Permission to use, copy, modify and distribute this software and its +! * documentation for any purpose is hereby granted without fee, +! * provided that the above copyright notice appear in all copies and +! * that both that copyright notice and this permission notice appear +! * in supporting documentation. It is provided "as is" without express +! * or implied warranty. +! * +! +! +! Author(s): Thomas Bretz 04/2002 +! +! Copyright: MAGIC Software Development, 2000-2002 +! +! +\* ======================================================================== */ + +///////////////////////////////////////////////////////////////////////////// +// +// MDataList +// Chain, catenation ? +// +///////////////////////////////////////////////////////////////////////////// + +#include "MDataMember.h" + +#include + +#include "MLog.h" +#include "MLogManip.h" + +#include "MParList.h" + +ClassImp(MDataMember); + +MDataMember::MDataMember(MParContainer *obj, TMethodCall *call) +{ + fObject = obj; + fCall = call; +} + +Double_t MDataMember::GetValue() const +{ + if (!fCall) + return 0; + + switch (fCall->ReturnType()) + { + case TMethodCall::kLong: + Long_t l; + fCall->Execute(fObject, l); + return (Double_t)l; + + case TMethodCall::kDouble: + Double_t v; + fCall->Execute(fObject, v); + return v; + + default: + *fLog << err << "DataMember " << fName << " of "; + *fLog << fObject->GetName() << " neither int nor float... abort." << endl; + return 0; + } +} + +Bool_t MDataMember::PreProcess(const MParList *plist) +{ + TString cname(fName); + TString mname(fName); + + const char *dot = strrchr(cname, '.'); + + if (dot) + { + const int pos = dot-cname; + + cname.Remove(pos); + mname.Remove(0, pos+1); + } + + fObject = (MParContainer*)plist->FindObject(cname); + if (!fObject) + { + *fLog << err << "Object '" << cname << "' not in parameter list... aborting." << endl; + return kFALSE; + } + + fCall = fObject->GetterMethod(mname); + + return fCall ? kTRUE : kFALSE; +} + +void MDataMember::Print(Option_t *opt = "") const +{ + *fLog << fName << flush; +} + Index: trunk/MagicSoft/Mars/mdata/MDataMember.h =================================================================== --- trunk/MagicSoft/Mars/mdata/MDataMember.h (revision 1287) +++ trunk/MagicSoft/Mars/mdata/MDataMember.h (revision 1287) @@ -0,0 +1,35 @@ +#ifndef MARS_MDataMember +#define MARS_MDataMember + +///////////////////////////////////////////////////////////////////////////// +// // +// MDataMember // +// // +///////////////////////////////////////////////////////////////////////////// + +#ifndef MARS_MData +#include "MData.h" +#endif + +class MDataMember : public MData +{ +private: + MParContainer *fObject; + TMethodCall *fCall; + +public: + MDataMember(const char *member) : fObject(NULL), fCall(NULL) + { + fName = member; + } + MDataMember(MParContainer *obj, TMethodCall *call); + + Double_t GetValue() const; + Bool_t PreProcess(const MParList *plist); + + void Print(Option_t *opt = "") const; + + ClassDef(MDataMember, 0) // List to combine several filters logically +}; + +#endif Index: trunk/MagicSoft/Mars/mdata/MDataValue.cc =================================================================== --- trunk/MagicSoft/Mars/mdata/MDataValue.cc (revision 1287) +++ trunk/MagicSoft/Mars/mdata/MDataValue.cc (revision 1287) @@ -0,0 +1,43 @@ +/* ======================================================================== *\ +! +! * +! * This file is part of MARS, the MAGIC Analysis and Reconstruction +! * Software. It is distributed to you in the hope that it can be a useful +! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. +! * It is distributed WITHOUT ANY WARRANTY. +! * +! * Permission to use, copy, modify and distribute this software and its +! * documentation for any purpose is hereby granted without fee, +! * provided that the above copyright notice appear in all copies and +! * that both that copyright notice and this permission notice appear +! * in supporting documentation. It is provided "as is" without express +! * or implied warranty. +! * +! +! +! Author(s): Thomas Bretz 04/2002 +! +! Copyright: MAGIC Software Development, 2000-2002 +! +! +\* ======================================================================== */ + +///////////////////////////////////////////////////////////////////////////// +// +// MDataValue +// Chain, catenation ? +// +///////////////////////////////////////////////////////////////////////////// + +#include "MDataValue.h" + +#include "MLog.h" +#include "MLogManip.h" + +ClassImp(MDataValue); + +void MDataValue::Print(Option_t *opt = "") const +{ + *fLog << fValue << flush; +} + Index: trunk/MagicSoft/Mars/mdata/MDataValue.h =================================================================== --- trunk/MagicSoft/Mars/mdata/MDataValue.h (revision 1287) +++ trunk/MagicSoft/Mars/mdata/MDataValue.h (revision 1287) @@ -0,0 +1,32 @@ +#ifndef MARS_MDataValue +#define MARS_MDataValue + +///////////////////////////////////////////////////////////////////////////// +// // +// MDataValue // +// // +///////////////////////////////////////////////////////////////////////////// + +#ifndef MARS_MData +#include "MData.h" +#endif + +class MDataValue : public MData +{ +private: + Double_t fValue; + +public: + MDataValue(Double_t v) : fValue(v) + { + } + + Double_t GetValue() const { return fValue; } + Bool_t PreProcess(const MParList *plist) { return kTRUE; } + + void Print(Option_t *opt = "") const; + + ClassDef(MDataValue, 0) // List to combine several filters logically +}; + +#endif Index: trunk/MagicSoft/Mars/mdata/Makefile =================================================================== --- trunk/MagicSoft/Mars/mdata/Makefile (revision 1287) +++ trunk/MagicSoft/Mars/mdata/Makefile (revision 1287) @@ -0,0 +1,54 @@ +################################################################## +# +# makefile +# +# for the MARS software +# +################################################################## +# @maintitle + +# @code + +# +# please change all system depend values in the +# config.mk.${OSTYPE} file +# +# +include ../Makefile.conf.$(OSTYPE) +include ../Makefile.conf.general + +# @endcode + +INCLUDES = -I. -I../mbase + +# @code + +CINT = Data +LIB = mdata.a + +#------------------------------------------------------------------------------ + +.SUFFIXES: .c .cc .cxx .h .hxx .o + +SRCFILES = MData.cc \ + MDataMember.cc \ + MDataValue.cc \ + MDataList.cc \ + MDataChain.cc + +SRCS = $(SRCFILES) +HEADERS = $(SRCFILES:.cc=.h) +OBJS = $(SRCFILES:.cc=.o) + +############################################################ + +all: $(LIB) + +include ../Makefile.rules + +clean: rmcint rmobjs rmcore rmlib + +mrproper: clean rmbak + +# @endcode +