Changeset 1337

Timestamp:

06/03/02 10:10:21 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/comprob.C (added)
• macros/dohtml.C (modified) (1 diff)
• macros/multidimdist.C (added)
• macros/star.C (added)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/MCompProbCalc.cc (added)
• manalysis/MCompProbCalc.h (added)
• manalysis/MHadroness.cc (added)
• manalysis/MHadroness.h (added)
• manalysis/MMultiDimDistCalc.cc (added)
• manalysis/MMultiDimDistCalc.h (added)
• manalysis/Makefile (modified) (2 diffs)
• mbase/MAGIC.h (modified) (1 diff)
• mbase/MLogo.cc (added)
• mbase/MLogo.h (added)
• mbase/MParList.cc (modified) (1 diff)
• mbase/MParList.h (modified) (1 diff)
• mbase/MReadMarsFile.cc (modified) (2 diffs)
• mbase/MReadMarsFile.h (modified) (2 diffs)
• mbase/MReadTree.cc (modified) (4 diffs)
• mbase/MReadTree.h (modified) (1 diff)
• mbase/MTaskList.cc (modified) (3 diffs)
• mbase/MWriteAsciiFile.cc (modified) (1 diff)
• mbase/MWriteAsciiFile.h (modified) (2 diffs)
• mfilter/FilterLinkDef.h (modified) (1 diff)
• mfilter/MFParticleId.cc (added)
• mfilter/MFParticleId.h (added)
• mfilter/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2002/06/03: Thomas Bretz
+
+   * mhist/MHCompProb.[h,cc]:
+     - added
+
+   * mhist/MHHadroness.[h,cc]:
+     - added
+
+   * mhist/HistLinkDef.h, mhist/Makefile:
+     - added MHCompProb
+     - added MHHadroness
+
+   * mhist/MFillH.cc:
+     - added a info-output
+
+   * mhist/MH3.cc:
+     - excluded temporary profiles from directory
+
+   * mhist/MHMatrix.[h,cc]:
+     - added code to calculate multi-dimensional distances
+     - added comments
+
+   * mbase/MAGIC.h:
+     - changed kGAMMA to 1
+
+   * mbase/MParList.[h,cc]:
+     - added Replace-function
+
+   * mbase/MReadMarsFile.[h,cc]:
+     - added correct seeking for the run headers
+
+   * mbase/MReadTree.[h,cc]:
+     - added GetFileIndex()
+
+   * mbase/MTaskList.cc:
+     - changed fTasksProcess.Delete() to fTasksProcess.Clear()
+
+   * mbase/MWriteAsciiFile.[h,cc]:
+     - added some code for future usage (in comments)
+
+   * mbase/MLogo.[h,cc]:
+     - added (not in use)
+
+   * mfilter/MFParticleId.[h,cc]:
+     - added
+
+   * mfilter/Makefile, mfilter/FilterLinkDef.h:
+     - added MFParticleId
+
+   * manalysis/MHadroness.[h,cc]:
+     - added
+
+   * manalysis/MCompProbCalc.[h,cc]:
+     - added
+
+   * manalysis/MMultiDimDistCalc.[h,cc]:
+     - added
+                                                           
+   * manalysis/AnalysisLinkDef.h, manalysis/Makefile:
+     - added MHadroness
+     - added MCompProbCalc
+     - added MMultiDimDistCalc
+
+   * manalysis/Makefile:
+     - added ../mdata
+     - added ../mhist
+
+   * macros/star.C:
+     - added
+
+   * macros/comprob.C:
+     - added
+
+   * macros/multidimdist.C:
+     - added
+  
+  * macros/dohtml.C:
+     - added star.C
+     - added comprob.C
+     - added multidimdist.C
+
+
+
  2002/05/29: Thomas Bretz
 

trunk/MagicSoft/Mars/macros/dohtml.C

@@ -41 +41 @@
 
     html.SetSourceDir("macros");
-    html.Convert("merpp.C",       "MARS - Merging and Preprocessing");
-    html.Convert("readraw.C",     "MARS - How To Read A Raw");
-    html.Convert("rootlogon.C",   "MARS - rootlogon.C");
-    html.Convert("readCT1.C",     "MARS - Read and display CT1 Events");
-    html.Convert("readMagic.C",   "MARS - Read and display Magic Events");
-    html.Convert("CT1Hillas.C",   "MARS - Calculate CT1 Hillas");
-    html.Convert("MagicHillas.C", "MARS - Calculate Magic Hillas");
-    html.Convert("collarea.C",    "MARS - Calculate Collection Area from a MC root file");
-    html.Convert("threshold.C",   "MARS - Calculate Energy Threshold from a MC root file");
-    html.Convert("trigrate.C",    "MARS - Calculate Trigger Rate from a MC root file");
+    html.Convert("merpp.C",        "MARS - Merging and Preprocessing");
+    html.Convert("readraw.C",      "MARS - How To Read A Raw");
+    html.Convert("rootlogon.C",    "MARS - rootlogon.C");
+    html.Convert("readCT1.C",      "MARS - Read and display CT1 Events");
+    html.Convert("readMagic.C",    "MARS - Read and display Magic Events");
+    html.Convert("CT1Hillas.C",    "MARS - Calculate CT1 Hillas");
+    html.Convert("MagicHillas.C",  "MARS - Calculate Magic Hillas");
+    html.Convert("collarea.C",     "MARS - Calculate Collection Area from a MC root file");
+    html.Convert("threshold.C",    "MARS - Calculate Energy Threshold from a MC root file");
+    html.Convert("trigrate.C",     "MARS - Calculate Trigger Rate from a MC root file");
+    html.Convert("star.C",         "MARS - (St)andard (A)nalysis and (R)econstruction");
+    html.Convert("comprob.C",      "MARS - Calculation of composite probabilities for G/H-Seperation");
+    html.Convert("multidimdist.C", "MARS - Calculation of multidimensional distances for G/H-Seperation");
 }

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -21 +21 @@
 #pragma link C++ class MMcPedestalNSBAdd+;
 
+#pragma link C++ class MHadroness+;
+
+#pragma link C++ class MCompProbCalc+;
+#pragma link C++ class MMultiDimDistCalc+;
+
 #pragma link C++ class MSrcPosCam+;
 #pragma link C++ class MHillas+;

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mgui -I../mmc -I../mraw
+INCLUDES = -I. -I../mbase -I../mgui -I../mmc -I../mraw -I../mdata -I../mhist
 
 #------------------------------------------------------------------------------
@@ -37 +37 @@
            MEnergyEstimate.cc \
            MSrcPosCam.cc \
+           MHadroness.cc \
+           MCompProbCalc.cc \
+           MMultiDimDistCalc.cc \
            MHillas.cc \
            MHillasSrc.cc \

trunk/MagicSoft/Mars/mbase/MAGIC.h

@@ -22 +22 @@
 //     ParticleId for Monte Carlo simulation
 //
-const Int_t kGAMMA  =    0;
+const Int_t kGAMMA  =    1;
 const Int_t kPROTON =   14;
 const Int_t kHELIUM =  402;

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -215 +215 @@
 // --------------------------------------------------------------------------
 //
+//  Find an object with the same name in the list and replace it with
+//  the new one. If the kIsOwner flag is set and the object was not
+//  created automatically, the object is deleted.
+//
+Bool_t MParList::Replace(MParContainer *cont)
+{
+    //
+    //  check if the object (you want to add) exists
+    //
+    if (!cont)
+        return kFALSE;
+
+    TObject *obj = FindObject(cont->GetName());
+    if (!obj)
+    {
+        *fLog << warn << "No object with the same name '";
+        *fLog << cont->GetName() << "' in list... ignored." << endl;
+        return kFALSE;
+    }
+
+    fContainer->Remove(obj);
+
+    if (TestBit(kIsOwner) && !fAutodelete->FindObject(obj))
+        delete obj;
+
+    *fLog << inf << "MParContainer '" << obj->GetName() << "' found and replaced..." << endl;
+
+    return AddToList(cont);
+}
+
+// --------------------------------------------------------------------------
+//
 //  Find an object in the list.
 //  'name' is the name of the object you are searching for.

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -42 +42 @@
     void   AddToList(TObjArray *list);
 
+    Bool_t Replace(MParContainer *obj);
+
     void SetLogStream(MLog *log);
 

trunk/MagicSoft/Mars/mbase/MReadMarsFile.cc

@@ -108 +108 @@
 Bool_t MReadMarsFile::Notify()
 {
+    Int_t runtype = -1;
+/*
+    const MRawRunHeader *runheader = (MRawRunHeader*)fParList->FindObject("MRawRunHeader");
+    if (runheader)
+        runtype = runheader->GetRunType();
+*/
     //
     // Try to read the new run headers. If reading the new run header
     // was successfull call the ReInits
     //
+    const Int_t idx = GetFileIndex();
+    fRun->SetEventNum(idx<0?0:idx); // Assumption: One Entry per File!
     if (fRun->Process())
     {
-        *fLog << inf << "MReadMarsFile: Switching to '" << GetFileName() << "' ";
-        *fLog << "(before event #" << GetEventNum()-1 << ")" << endl;
-
+        *fLog << inf << "MReadMarsFile: Switching to #" << GetFileIndex();
+        *fLog << " '" << GetFileName() << "' (before event #";
+        *fLog << GetEventNum()-1 << ")" << endl;
+/*
+        if (runheader)
+            if (runtype != runheader->GetRunType())
+                *fLog << warn << "Warning - You are mixing files with different run types!" << endl;
+*/
         if (fTaskList->ReInit())
             return kTRUE;
@@ -137 +150 @@
 Bool_t MReadMarsFile::PreProcess(MParList *pList)
 {
+    fParList  = pList;
     fTaskList = (MTaskList*)pList->FindObject("MTaskList");
 
     if (!fRun->PreProcess(pList))
+    {
+        *fLog << err << "Error - PreProcessing MReadMarsFile::fRun... aborting." << endl;
         return kFALSE;
+    }
 
+    const Int_t idx = GetFileIndex();
+    fRun->SetEventNum(idx<0?0:idx); // Assumption: One Entry per File!
     if (!fRun->Process())
+    {
+        *fLog << err << "Error - Processing MReadMarsFile::fRun... aborting." << endl;
         return kFALSE;
-
-    fRun->SetEventNum(0);
+    }
 
     return MReadTree::PreProcess(pList);

trunk/MagicSoft/Mars/mbase/MReadMarsFile.h

@@ -6 +6 @@
 #endif
 
+class MParList;
 class MTaskList;
 
@@ -12 +13 @@
 private:
     MReadTree *fRun;
+    MParList  *fParList;  //! Parlist for reinitialization
     MTaskList *fTaskList; //! Tasklist for reinitialization
 

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -55 +55 @@
 #include <TFile.h>           // TFile::GetName
 #include <TChain.h>
+#include <TSystem.h>         // gSystem->ExpandPath
 #include <TGProgressBar.h>
 #include <TChainElement.h>
@@ -746 +747 @@
 // --------------------------------------------------------------------------
 //
+//  Return the number of the file in the chain, -1 in case of an error
+//
+Int_t MReadTree::GetFileIndex() const
+{
+    return fChain->GetTreeNumber();
+    /*
+    const TString filename = fChain->GetFile()->GetName();
+
+    int i=0;
+    TObject *file = NULL;
+
+    TIter Next(fChain->GetListOfFiles());
+    while ((file=Next()))
+    {
+        if (filename==gSystem->ExpandPathName(file->GetTitle()))
+            return i;
+        i++;
+    }
+    return -1;
+    */
+}
+
+// --------------------------------------------------------------------------
+//
 //  This schedules a TObject which Notify(9 function is called in case
 //  of MReadTree (TChain) switches from one file in the chain to another
@@ -759 +784 @@
     *fLog << all << GetDescriptor() << dec << endl;
     *fLog << setfill('-') << setw(strlen(GetDescriptor())) << "" << endl;
-    *fLog << " Files:" << endl;
+    *fLog << " Files [Tree]:" << endl;
 
     int i = 0;
@@ -765 +790 @@
     TObject *obj = NULL;
     while ((obj=Next()))
-        *fLog << " " << i++ << ") " << obj->GetName() << endl;
-
-    *fLog << " Entries: " << fNumEntries << endl;
-    *fLog << " Next Entry: " << fNumEntry << endl;
-}
+        *fLog << " " << i++ << ") " << obj->GetTitle() << " [" << obj->GetName() << "]" << endl;
+
+    *fLog << " Total Number of Entries: " << fNumEntries << endl;
+    *fLog << " Next Entry to read: " << fNumEntry << endl;
+}

trunk/MagicSoft/Mars/mbase/MReadTree.h

@@ -59 +59 @@
 
     TString GetFileName() const;
+    Int_t   GetFileIndex() const;
 
     virtual void   AddNotify(TObject *obj);

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -303 +303 @@
     fParList = pList;
 
-    fTasksProcess.Delete();
+    fTasksProcess.Clear();
 
     //
@@ -317 +317 @@
     while ((task=(MTask*)Next()))
     {
+        *fLog << all << task->GetName() << "... " << flush;
+
         if (CheckClassForProcess(task->IsA()))
             fTasksProcess.Add(task);
@@ -457 +459 @@
     while ( (task=(MTask*)Next()) )
     {
+        *fLog << all << task->GetName() << "... " << flush;
+
         if (!task->CallPostProcess())
             return kFALSE;
-
-        *fLog << all << task->GetName() << "... " << flush;
     }
 

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -263 +263 @@
 }
 
+/*
+Bool_t MWriteAsciiFile::PreProcess(MParList *plist)
+{
+    MDataChain *chain=NULL;
+
+    TIter Next(&fList);
+    while (((MDataChain*)chain=Next()))
+        if (!chain->PreProcess(plist))
+            return kFALSE;
+
+    return MWriteFile::PreProcess(plist);
+}
+
+void MWriteAsciiFile::Add(const char *rule)
+{
+    MDataChain *chain = new MDataChain(rule);
+    fList.Add(chain);
+}
+*/

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.h

@@ -29 +29 @@
 
     TString fNameFile;
-
+/*
+    TList fList;
+*/
     virtual void   CheckAndWrite() const;
     virtual Bool_t IsFileOpen() const;
@@ -47 +49 @@
     void AddContainer(MParContainer *cont, const char *member="", Double_t scale=1);
 
+    /*
+     Bool_t PreProcess(MParList *plist);
+     void Add(const char *rule);
+     */
+
     ClassDef(MWriteAsciiFile, 0) // Class to write one container to an ascii file
 };

trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h

@@ -8 +8 @@
 #pragma link C++ class MFAlpha+;
 #pragma link C++ class MFTriggerLvl1+;
+#pragma link C++ class MFParticleId+;
 #pragma link C++ class MFDataMember+;
 

trunk/MagicSoft/Mars/mfilter/Makefile

@@ -34 +34 @@
            MF.cc \
            MFDataMember.cc \
-           MFDataChain.cc \
+           MFParticleId.cc \
            MFAlpha.cc
+#          MFDataChain.cc \
 
 SRCS    = $(SRCFILES)