Changeset 6932 for trunk

Timestamp:

04/12/05 17:05:49 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (1 diff)
• ganymed.cc (modified) (1 diff)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/MEnergyEstimate.cc (modified) (3 diffs)
• manalysis/MEnergyEstimate.h (modified) (2 diffs)
• manalysis/Makefile (modified) (1 diff)
• mbase/MStatusArray.cc (modified) (3 diffs)
• mbase/MStatusArray.h (modified) (2 diffs)
• mbase/MStatusDisplay.cc (modified) (4 diffs)
• mbase/MStatusDisplay.h (modified) (2 diffs)
• mcalib/MCalibrateData.cc (modified) (4 diffs)
• mcalib/MCalibrationRelTimeCalc.cc (modified) (1 diff)
• mfbase/MF.cc (modified) (2 diffs)
• mfbase/MF.h (modified) (4 diffs)
• mfileio/MReadTree.cc (modified) (1 diff)
• mhbase/MBinning.cc (modified) (2 diffs)
• mhflux/MHAlpha.cc (modified) (12 diffs)
• mhflux/MHAlpha.h (modified) (2 diffs)
• mhflux/MHEnergyEst.cc (modified) (5 diffs)
• mhflux/MHEnergyEst.h (modified) (3 diffs)
• mjobs/MJOptimize.cc (modified) (5 diffs)
• mjobs/MJOptimize.h (modified) (1 diff)
• mranforest/MRFEnergyEst.cc (modified) (6 diffs)
• mranforest/MRFEnergyEst.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -82 +82 @@
    * mranforest/MRFEnergyEst.[h,cc]:
      - replaced MEnergyEst by MParameterD
+
+   * mfileio/MReadTree.cc:
+     - shortened the output a bit when siwtching to the next file
 
 

trunk/MagicSoft/Mars/Makefile

@@ -66 +66 @@
           mgui \
           mranforest \
-          mhistmc \
           mjobs \
           mtools \

trunk/MagicSoft/Mars/ganymed.cc

@@ -143 +143 @@
         arg.Print("options");
         gLog << endl;
+        return 2;
     }
 

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -12 +12 @@
 #pragma link C++ class MMultiDimDistCalc+;
 
-#pragma link C++ class MEnergyEst+;
 #pragma link C++ class MEnergyEstimate+;
 

trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc

@@ -47 +47 @@
 
 #include "MDataChain.h"
-#include "MEnergyEst.h"
+#include "MParameters.h"
 
 #include "MLog.h"
@@ -107 +107 @@
 Int_t MEnergyEstimate::PreProcess(MParList *plist)
 {
-    fEnergy = (MEnergyEst*)plist->FindCreateObj("MEnergyEst");
+    fEnergy = (MParameterD*)plist->FindCreateObj("MParameterD", "MEnergyEst");
     if (!fEnergy)
         return kFALSE;
@@ -130 +130 @@
         return kCONTINUE;
 
-    fEnergy->SetEnergy(val);
+    fEnergy->SetVal(val);
     fEnergy->SetReadyToSave();
     return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Print the rule used for energy estimation
+//
+void MEnergyEstimate::Print(Option_t *o) const
+{
+    *fLog << all << GetDescriptor() << ":";
+    if (!fData)
+        *fLog << " <n/a>" << endl;
+    else
+        *fLog << endl << fData->GetRule() << endl;
 }
 

trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.h

@@ -7 +7 @@
 
 class MData;
-class MEnergyEst;
+class MParameterD;
 
 class MEnergyEstimate : public MTask
 {
 private:
-    MData      *fData;    //->
-    MEnergyEst *fEnergy;
+    MData       *fData;    //->
+    MParameterD *fEnergy;  //!
 
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
@@ -28 +28 @@
     void SetVariables(const TArrayD &);
 
-    ClassDef(MEnergyEstimate, 0) // Task to estimate the energy by a rule
+    void Print(Option_t *o="") const;
+
+    ClassDef(MEnergyEstimate, 1) // Task to estimate the energy by a rule
 };
 

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -28 +28 @@
 SRCFILES = MGeomApply.cc \
            MCameraData.cc \
-           MEnergyEst.cc \
            MEnergyEstimate.cc \
            MMatrixLoop.cc \

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -61 +61 @@
     delete d;
     return 0;
+}
+
+void MStatusArray::DisplayIn(MStatusDisplay &d, const char *tab) const
+{
+    d.Display(*this, tab);
 }
 
@@ -149 +154 @@
     {
         if (!c)
+        {
+            gLog << warn << "Canvas '" << canvas << "' not found..." << endl;
             return 0;
+        }
 
         TObject *o = FindObjectInPad(c, object, cls);
         if (!o)
+        {
+            gLog << warn << "Object '" << object << "' [" << base << "] not found in canvas '" << canvas << "'..." << endl;
             return 0;
+        }
 
-        return o->InheritsFrom(cls) ? o : 0;
+        return o; //o->InheritsFrom(cls) ? o : 0;
     }
 
@@ -169 +180 @@
     }
 
+    gLog << warn << "Object '" << object << "' [" << base << "] not found in canvas '" << canvas << "'..." << endl;
     return NULL;
 }

trunk/MagicSoft/Mars/mbase/MStatusArray.h

@@ -10 +10 @@
 class TVirtualPad;
 
+class MStatusDisplay;
+
 class MStatusArray : public TObjArray
 {
@@ -18 +20 @@
 public:
     TObject *DisplayIn(Option_t *o=0) const;         // *MENU*
+    void     DisplayIn(MStatusDisplay &d, const char *tab=0) const;
     TObject *Display() const { return DisplayIn(); } // *MENU*
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1686 +1686 @@
 }
 
-Bool_t MStatusDisplay::Display(const TObjArray &list)
+Bool_t MStatusDisplay::Display(const TObjArray &list, const char *tab)
 {
     TIter Next(&list);
@@ -1702 +1702 @@
     while ((c=(TCanvas*)Next()))
         //if (!GetCanvas(c->GetName()))
+        if (!tab || c->GetName()==(TString)tab)
             DrawClonePad(AddTab(c->GetName()), *c);
 
@@ -1711 +1712 @@
 // Reads the contents of a saved MStatusDisplay from a file.
 //
-Int_t MStatusDisplay::Read(const char *name)
+Int_t MStatusDisplay::Read(const char *name, const char *tab)
 {
     if (!gFile)
@@ -1734 +1735 @@
     }
 
-    if (!Display(list))
+    if (!Display(list, tab))
     {
         *fLog << err << "MStatusDisplay::Display: No entry in " << name << "." << endl;

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -122 +122 @@
     void DrawClonePad(TCanvas &newc, TCanvas &oldc) const;
     void CanvasSetFillColor(TPad &c, Int_t col) const;
-    Bool_t Display(const TObjArray &list);
+    Bool_t Display(const TObjArray &list, const char *tab=0);
 
     void AddExtension(TString &name, const TString &ext, Int_t num) const;
@@ -167 +167 @@
      Int_t Write(Int_t num, const char *name="MStatusDisplay", Int_t option=0, Int_t bufsize=0) const;
 
-     Int_t Read(const char *name="MStatusDisplay");
+     Int_t Read(const char *name, const char *tab);
+     Int_t Read(const char *name="MStatusDisplay")
+     {
+         return Read(name, 0);
+     }
      Int_t Write(const char *name="MStatusDisplay", Int_t option=0, Int_t bufsize=0)
      {

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -390 +390 @@
     {
     case kPhe:
-      *fLog << warn << "WARNING - Renormalization to photo-electrons applied!" << endl;
+      *fLog << inf << "Calibrating in units of equivalent (outer/inner=4) photo-electrons." << endl;
       break;
     case kPhot:
+      *fLog << inf << "Calibrating in units of photons." << endl;
       break;
     }
@@ -403 +404 @@
         if (fCalibrations->GetSize() != npixels)
           {
-            *fLog << err << GetDescriptor()
-                  << ": Size mismatch between MGeomCam and MCalibrationChargeCam ... abort!" << endl;
+            *fLog << "Size mismatch between MGeomCam and MCalibrationChargeCam... abort!" << endl;
             return kFALSE;
           }
@@ -410 +410 @@
         if (fBadPixels->GetSize() != npixels)
           {
-            *fLog << err << GetDescriptor()
-                  << ": Size mismatch between MGeomCam and MBadPixelsCam ... abort!" << endl;
+            *fLog << "Size mismatch between MGeomCam and MBadPixelsCam... abort!" << endl;
             return kFALSE;
           }
@@ -417 +416 @@
         if (fBadPixels->GetSize() != npixels)
           {
-            *fLog << err << GetDescriptor()
-                  << ": Size mismatch between MGeomCam and MBadPixelsCam ... abort!" << endl;
+            *fLog << "Size mismatch between MGeomCam and MBadPixelsCam... abort!" << endl;
             return kFALSE;
           }

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -270 +270 @@
                     Form("%s%2.1f%s","Time resolution less than ",fRelTimeResolutionLimit," FADC slices from Mean:   "));
   PrintUncalibrated(MBadPixelsPix::kRelTimeOscillating,   
-                    "Pixels with changing Rel. Times   over time:      ");
+                    "Pixels with changing Rel. Times over time:             ");
   PrintUncalibrated(MBadPixelsPix::kRelTimeNotFitted,     
-                    "Pixels with unsuccesful Gauss fit to the times:   ");
+                    "Pixels with unsuccesful Gauss fit to the times:        ");
 
   if (asciilog)

trunk/MagicSoft/Mars/mfbase/MF.cc

@@ -106 +106 @@
 // Default Constructor. Don't use.
 //
-MF::MF() : fF(NULL)
+MF::MF() : fF(NULL), fAllowEmpty(kFALSE)
 {
     fName  = gsDefName.Data();
@@ -117 +117 @@
 // the class description above.
 //
-MF::MF(const char *text, const char *name, const char *title)
+MF::MF(const char *text, const char *name, const char *title) : fAllowEmpty(kFALSE)
 {
     fName  = name  ? name  : gsDefName.Data();

trunk/MagicSoft/Mars/mfbase/MF.h

@@ -21 +21 @@
     static const TString gsDefTitle; //!
 
-    MFilter *fF; // Filter
+    MFilter *fF;                     // Filter
+    Bool_t fAllowEmpty;              // Not a Bit to be stored
 
     Int_t IsRule(TString &txt, TString &rule) const;
@@ -32 +33 @@
     void StreamPrimitive(ofstream &out) const;
 
-    enum { kAllowEmpty = BIT(14) };
-
 public:
     MF();
@@ -40 +39 @@
 
     // MF
-    void SetAllowEmpty(Bool_t b=kTRUE) { b ? SetBit(kAllowEmpty) : ResetBit(kAllowEmpty); }
-    Bool_t IsAllowEmpty() const { return TestBit(kAllowEmpty); }
+    void SetAllowEmpty(Bool_t b=kTRUE) { fAllowEmpty = b; }
+    Bool_t IsAllowEmpty() const { return fAllowEmpty; }
 
     // MFilter
@@ -61 +60 @@
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
 
-    ClassDef(MF, 0) // A Filter for cuts in any data member
+    ClassDef(MF, 1) // A Filter for cuts in any data member
 };
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -277 +277 @@
         return kFALSE;
 
-    *fLog << inf << GetDescriptor() << ": Switching to #" << GetFileIndex();
-    *fLog << " '" << GetFileName() << "' (before event #";
+    *fLog << inf << GetDescriptor() << ": Next file #" << GetFileIndex();
+    *fLog << " '" << GetFileName() << "' (next evt #";
     *fLog << GetNumEntry()-1 << ")" << endl;
 

trunk/MagicSoft/Mars/mhbase/MBinning.cc

@@ -248 +248 @@
     str = str.Strip(TString::kBoth);
 
-    TString typ;
+    TString typ(str);
     Ssiz_t pos = str.First(' ');
     if (pos>=0)
     {
         typ = str(0, pos);
+        str.Remove(0, pos);
+        str = str.Strip(TString::kBoth);
         if (typ!=(TString)"lin" && typ!=(TString)"log" && typ!=(TString)"cos")
         {
@@ -261 +263 @@
 
     SetEdges(nbins, loedge, upedge, typ.Data());
-
-    str = str.Strip(TString::kBoth);
 
     if (!str.IsNull())

trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

@@ -57 +57 @@
 #include "MSrcPosCam.h"
 #include "MHillasSrc.h"
-#include "MEnergyEst.h"
 #include "MTime.h"
 #include "MObservatory.h"
@@ -116 +115 @@
     fHEnergy.UseCurrentStyle();
 
-    fHTheta.SetName("Theta");
+    fHTheta.SetName("ExcessTheta");
     fHTheta.SetTitle(" N_{exc} vs. \\Theta ");
     fHTheta.SetXTitle("\\Theta [\\circ]");
@@ -124 +123 @@
 
     // effective on time versus time
-    fHTime.SetName("Time");
+    fHTime.SetName("ExcessTime");
     fHTime.SetTitle(" N_{exc} vs. Time ");
     fHTime.SetXTitle("Time");
@@ -268 +267 @@
     }
     */
-    fEnergy = (MEnergyEst*)pl->FindObject("MEnergyEst");
+    fEnergy = (MParameterD*)pl->FindObject("MEnergyEst", "MParameterD");
     if (!fEnergy)
     { /*
@@ -277 +276 @@
         } */
 
-        *fLog << warn << "MEnergyEst not found... " << flush;
+        *fLog << warn << "MEnergyEst [MParameterD] not found... " << flush;
 
         if (!fHillas)
@@ -286 +285 @@
             *fLog << "ignored." << endl;
 
-        fHEnergy.SetName("Size");
+        fHEnergy.SetName("ExcessSize");
         fHEnergy.SetTitle(" N_{exc} vs. Size ");
         fHEnergy.SetXTitle("Size [\\gamma]");
@@ -292 +291 @@
     else
     {
-        fHEnergy.SetName("Energy");
+        fHEnergy.SetName("ExcessEnergy");
         fHEnergy.SetTitle(" N_{exc} vs. E_{est} ");
         fHEnergy.SetXTitle("E_{est} [GeV]");
@@ -488 +487 @@
         if (fHillas)
             size = fHillas->GetSize();
-        energy = fEnergy   ? fEnergy->GetEnergy() : (fHillas?fHillas->GetSize():1000);
+        energy = fEnergy   ? fEnergy->GetVal() : (fHillas?fHillas->GetSize():1000);
         theta  = fPointPos ? fPointPos->GetZd()   : 0;
     }
@@ -715 +714 @@
         pad->cd(2);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         fHEnergy.Draw();
 
@@ -737 +738 @@
         pad->cd(3);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         fHTime.Draw();
         AppendPad("time");
@@ -746 +749 @@
     {
         pad->cd(4);
+        gPad->SetGridx();
+        gPad->SetGridy();
         gPad->SetBorderMode(0);
         fHTheta.Draw();
@@ -910 +915 @@
         if (type==0)
         {
-            fMap[1] = fMatrix->AddColumn("MEnergyEst.fEnergy");
+            fMap[1] = fMatrix->AddColumn("MEnergyEst.fVal");
             fMap[2] = -1;
         }

trunk/MagicSoft/Mars/mhflux/MHAlpha.h

@@ -20 +20 @@
 class MParList;
 class MParameterD;
-class MEnergyEst;
 class MHillas;
 class MHMatrix;
@@ -96 +95 @@
 
     MParameterD  *fResult;      //!
-    MEnergyEst   *fEnergy;      //!
+    MParameterD  *fEnergy;      //!
     MHillas      *fHillas;      //!
     MPointingPos *fPointPos;    //!

trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc

@@ -120 +120 @@
     }
 
-    fEnergy = (MEnergyEst*)plist->FindObject("MEnergyEst");
+    fEnergy = (MParameterD*)plist->FindObject("MEnergyEst", "MParameterD");
     if (!fEnergy)
     {
-        *fLog << err << "MEnergyEst not found... aborting." << endl;
+        *fLog << err << "MEnergyEst [MParameterD] not found... aborting." << endl;
         return kFALSE;
     }
@@ -160 +160 @@
 Bool_t MHEnergyEst::Fill(const MParContainer *par, const Stat_t w)
 {
-    const Double_t eest  = fEnergy->GetEnergy();
+    const Double_t eest  = fEnergy->GetVal();
     const Double_t etru  = fMatrix ? GetVal(0) : fMcEvt->GetEnergy();
     const Double_t imp   = fMatrix ? GetVal(1) : fMcEvt->GetImpact()/100;
@@ -185 +185 @@
     fResult->SetVal(sigma);
 
-    *fLog << all << "Mean log10(Energy) Resoltion: " << Form("%.1f%%", TMath::Sqrt(fChisq-fBias*fBias)*100) << endl;
-    *fLog << all << "Mean log10(Energy) Bias:      " << Form("%.1f%%", fBias*100) << endl;
+    Print();
 
     return kTRUE;
+}
+
+void MHEnergyEst::Print(Option_t *o) const
+{
+    *fLog << all;
+    *fLog << "Mean log10(Energy) Resoltion: " << Form("%5.2f%%", TMath::Sqrt(fChisq-fBias*fBias)) << endl;
+    *fLog << "Mean log10(Energy) Bias:      " << Form("%5.2f%%", fBias) << endl;
 }
 
@@ -298 +304 @@
     gPad->SetGridy();
 
+    // Results in crashes....
     //gROOT->GetListOfCleanups()->Add(gPad); // WHY?
 
@@ -315 +322 @@
 
     h2->Draw("");
-    h1->Draw("E3same");
-    h1->Draw("Chistsame");
+    h1->Draw("E3 hist C same");
+//    h1->Draw("Chistsame");
 
     return h1;

trunk/MagicSoft/Mars/mhflux/MHEnergyEst.h

@@ -15 +15 @@
 
 class MMcEvt;
-class MEnergyEst;
 class MParList;
 class MParameterD;
@@ -24 +23 @@
 private:
     MMcEvt      *fMcEvt;  //!
-    MEnergyEst  *fEnergy; //!
+    MParameterD *fEnergy; //!
     MParameterD *fResult; //!
 
@@ -54 +53 @@
     void Paint(Option_t *opt="");
     void Draw(Option_t *option="");
+    void Print(Option_t *o="") const;
 
     ClassDef(MHEnergyEst, 1) //

trunk/MagicSoft/Mars/mjobs/MJOptimize.cc

@@ -109 +109 @@
 #include "MFilterList.h"
 #include "../mfilter/MFMagicCuts.h"
+#include "../mfilter/MFMagicCuts2.h"
 #include "MContinue.h"
 #include "MGeomCamMagic.h"
@@ -333 +334 @@
 void MJOptimize::AddPreCut(const char *rule)
 {
-    fPreCuts.Add(new MF(rule));
+    MFilter *f = new MF(rule);
+    f->SetBit(kCanDelete);
+    AddPreCut(f);
+}
+
+//------------------------------------------------------------------------
+//
+// Add a cut which is used to fill the matrix. If kCanDelete is set
+// MJOptimize takes the ownership.
+//
+void MJOptimize::AddPreCut(MFilter *f)
+{
+    fPreCuts.Add(f);
 }
 
@@ -823 +836 @@
     if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
         ((MFMagicCuts*)filter)->InitMapping(&m);
+    if (filter && filter->InheritsFrom(MFMagicCuts2::Class()))
+        ((MFMagicCuts2*)filter)->InitMapping(&m);
 
     MReadTree read("Events");
@@ -898 +913 @@
     if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
         ((MFMagicCuts*)filter)->InitMapping(&m);
+    if (filter && filter->InheritsFrom(MFMagicCuts2::Class()))
+        ((MFMagicCuts2*)filter)->InitMapping(&m);
 
     parlist.AddToList(&histon);
@@ -1025 +1042 @@
         return kFALSE;
 
+    hist.Print();
+
     TObjArray cont;
     cont.Add(&est);

trunk/MagicSoft/Mars/mjobs/MJOptimize.h

@@ -101 +101 @@
     void AddFilter(const char *rule);
     void AddPreCut(const char *rule);
+    void AddPreCut(MFilter *f);
 
     // Steering of optimization

trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.cc

@@ -34 +34 @@
 #include <TList.h>
 
-#include <TH1F.h>
-#include <TH2F.h>
+#include <TH1.h>
+#include <TH2.h>
 #include <TStyle.h>
 #include <TCanvas.h>
+#include <TMath.h>
+#include <TVector.h>
 
 #include "MHMatrix.h"
@@ -53 +55 @@
 
 #include "MData.h"
-
-#include "TFile.h"
-#include "TList.h"
-
-#include "TH1F.h"
-#include "TH2F.h"
-#include "TStyle.h"
-#include "TCanvas.h"
-#include "TMath.h"
-#include "TVector.h"
-
-#include "MEnergyEst.h"
+#include "MParameters.h"
 
 
@@ -287 +278 @@
         Double_t e_true = (*mptr)(i,ncols-1);
         Double_t e_est = 0;
-        Double_t hmax  = 0;
+        //Double_t hmax  = 0;
         Double_t hsum  = 0;
 
@@ -388 +379 @@
 Int_t MRFEnergyEst::PreProcess(MParList *plist)
 {
-    fEnergyEst = (MEnergyEst*)plist->FindCreateObj("MEnergyEst");
+    fEnergyEst = (MParameterD*)plist->FindCreateObj("MParameterD", "MEnergyEst");
     if (!fEnergyEst)
     {
-        *fLog << err << dbginf << "MEnergyEst not found... aborting." << endl;
+        *fLog << err << dbginf << "MEnergyEst [MParameterD] not found... aborting." << endl;
         return kFALSE;
     }
@@ -424 +415 @@
     *fData >> event;
 
-    Double_t e_est = 0;
-    Double_t hmax  = 0;
+    Double_t eest = 0;
+    //Double_t hmax  = 0;
     Double_t hsum  = 0;
         
@@ -438 +429 @@
         }*/
         hsum+=h;
-        e_est+=h*e;
-    }
-    e_est/=hsum;
-    e_est=pow(10.,e_est);
-
-    fEnergyEst->SetEnergy(e_est);
+        eest+=h*e;
+    }
+    eest/=hsum;
+    eest=pow(10.,eest);
+
+    fEnergyEst->SetVal(eest);
     fEnergyEst->SetReadyToSave();
 
     return kTRUE;
 }
-
-Int_t MRFEnergyEst::PostProcess()
-{
-
-    return kTRUE;
-}

trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.h

@@ -16 +16 @@
 class MHMatrix;
 class MDataArray;
-class MEnergyEst;
+class MParameterD;
 
 class MRFEnergyEst : public MTask
@@ -33 +33 @@
     TObjArray fEForests;
 
-    MEnergyEst *fEnergyEst;
+    MParameterD *fEnergyEst;
 
     Int_t PreProcess(MParList *plist);
     Int_t Process();
-    Int_t PostProcess();
 
     Int_t ReadForests(MParList *plist=NULL);