Changeset 7535 for trunk/MagicSoft

Timestamp:

02/27/06 11:44:49 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/train/trainseparation.C (modified) (1 diff)
• mhflux/MMcSpectrumWeight.cc (modified) (1 diff)
• mimage/MImagePar.h (modified) (1 diff)
• mranforest/MRanForest.cc (modified) (5 diffs)
• mranforest/MRanForest.h (modified) (1 diff)
• mranforest/MRanForestGrow.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
      - added showing the axis range of the time evolution histogram
 
+   * macros/train/trainseparation.C:
+     - replaced outdated MTTrainRFSeparate by MJTrainSeparation
+
+   * mastro/MAstro.h:
+     - added conversion constants for pc-m and pc-ly
+
+   * mhflux/MMcSpectrumWeight.cc:
+     - fixed typo in comment
+
+   * mimage/MImagePar.h:
+     - minor changes to layout
+
+   * mranforest/MRanForest.[h,cc]:
+     - the initialization of fTreeHad was done at the wrong moment
+     - replaced a cast int(x+.5) by TMath::Nint
+     - added some additional warning output
+     - added "!" to fTreeHad - it is only for temporary storage used
+       in the histogram classes
+
+   * mranforest/MRanForestGrow.h:
+     - added GetForest
+
 
 

trunk/MagicSoft/Mars/macros/train/trainseparation.C

@@ -6 +6 @@
     settst.SetNumAnalysis(2);
 
-    MTTrainRFSeparate opt;
+    MJTrainSeparation opt;
     //opt.SetDebug();
 

trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc

@@ -448 +448 @@
 //   MMcSpectrumWeight.NewSlope: -2.6
 //   MMcSpectrumWeight.Norm:      1.0
-//   MMcSpectrumWeight.Formula:  pow(MMcEvt.fEnergy, -2.6)
+//   MMcSpectrumWeight.Formula:  pow(X, -2.6)
 //
 Int_t MMcSpectrumWeight::ReadEnv(const TEnv &env, TString prefix, Bool_t print)

trunk/MagicSoft/Mars/mimage/MImagePar.h

@@ -30 +30 @@
     Short_t GetNumIslands() const { return fNumIslands; }
 
-    Short_t GetNumSatPixelsHG() const { return fNumSatPixelsHG; }
-    Short_t GetNumSatPixelsLG() const { return fNumSatPixelsLG; }
-    Short_t GetNumSinglePixels() const { return fNumSinglePixels; }
+    Short_t GetNumSatPixelsHG() const   { return fNumSatPixelsHG; }
+    Short_t GetNumSatPixelsLG() const   { return fNumSatPixelsLG; }
+    Short_t GetNumSinglePixels() const  { return fNumSinglePixels; }
     Float_t GetSizeSinglePixels() const { return fSizeSinglePixels; }
-    Float_t GetSizeSubIslands() const { return fSizeSubIslands; }
-    Float_t GetSizeMainIsland() const { return fSizeMainIsland; }
+    Float_t GetSizeSubIslands() const   { return fSizeSubIslands; }
+    Float_t GetSizeMainIsland() const   { return fSizeMainIsland; }
 
     void Print(Option_t *opt=NULL) const;

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -164 +164 @@
     //at least 1 tree
     fNumTrees=TMath::Max(n,1);
-    fTreeHad.Set(fNumTrees);
-    fTreeHad.Reset();
 }
 
@@ -250 +248 @@
         // classes directly given
         for (Int_t j=0;j<numdata;j++)
-            fClass[j] = int(fHadTrue[j]+0.5);
+            fClass[j] = TMath::Nint(fHadTrue[j]);
     }
 }
@@ -264 +262 @@
 Double_t MRanForest::CalcHadroness(const TVector &event)
 {
+    fTreeHad.Set(fNumTrees);
+
     Double_t hadroness=0;
-    Int_t ntree=0;
+    Int_t    ntree    =0;
 
     TIter Next(fForest);
@@ -341 +341 @@
     // setup rules to be used for classification/regression
     const MDataArray *allrules=(MDataArray*)mat->GetColumns();
-    if(allrules==NULL)
+    if (allrules==NULL)
     {
         *fLog << err <<"Rules of matrix == null, exiting"<< endl;
@@ -347 +347 @@
     }
 
+    if (allrules->GetNumEntries()!=dim+1)
+    {
+        *fLog << err <<"Rules of matrix " << allrules->GetNumEntries() << " mismatch dimension+1 " << dim+1 << "...exiting."<< endl;
+        return kFALSE;
+    }
+
     if (fRules)
         delete fRules;
+
     fRules = new MDataArray();
     fRules->Reset();

trunk/MagicSoft/Mars/mranforest/MRanForest.h

@@ -61 +61 @@
 
     // estimates for classification error of growing forest
-    TArrayD fTreeHad;      // Hadronness values
+    TArrayD fTreeHad;      //! Hadronness values (buffer for MHRanForest)
 
     Double_t fUserVal;     // A user value describing this tree (eg E-mc)

trunk/MagicSoft/Mars/mranforest/MRanForestGrow.h

@@ -34 +34 @@
     MRanForestGrow(const char *name=NULL, const char *title=NULL);
 
+    MRanForest *GetForest() const { return fRanForest; }
+
     //     void SetNumTrees(Int_t n=-1) { fNumTrees=n>0?n:100; }
     //     void SetNumTry(Int_t   n=-1) { fNumTry  =n>0?n:  3; }