Changeset 5330

Timestamp:

11/01/04 21:05:21 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mtemp/mpadova/macros/RanForestPD.C (modified) (11 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/11/01: Abelardo Moralejo
+
+   * mtemp/mpadova/macros/RanForestPD.C
+
+     - Just some cleaning up of old (commented) code.
+
 
 2004/11/01: David Paneque

trunk/MagicSoft/Mars/mtemp/mpadova/macros/RanForestPD.C

@@ -47 +47 @@
     // (less than total sample, to speed up execution)
     //
-    Float_t gamma_frac = 1.5*(numhadrons / numgammas);
+    Float_t gamma_frac = 2.*(numhadrons / numgammas);
 
 
@@ -54 +54 @@
     tlist.AddToList(&read);
 
-    MFParticleId fgamma("MMcEvt", '=', MMcEvt::kGAMMA);
-    tlist.AddToList(&fgamma);
-
-    MFParticleId fhadrons("MMcEvt", '!', MMcEvt::kGAMMA);
+     MFParticleId fhadrons("MMcEvt", '!', MMcEvt::kGAMMA);
     tlist.AddToList(&fhadrons);
 
-
     MHMatrix matrixg("MatrixGammas");
 
     //    matrixg.AddColumn("floor(0.5+(cos(MMcEvt.fTelescopeTheta)/0.01))");
-
     //    matrixg.AddColumn("MMcEvt.fTelescopePhi");
     //    matrixg.AddColumn("MSigmabar.fSigmabar");
@@ -78 +73 @@
     matrixg.AddColumn("MHillas.fWidth/(-13.1618+10.0492*log10(MHillas.fSize))");   
     matrixg.AddColumn("MHillas.fLength/(-57.3784+32.6131*log10(MHillas.fSize))");
-
 
     //    matrixg.AddColumn("(MHillas.fSize/(MHillas.fWidth*MHillas.fLength))");
@@ -93 +87 @@
     //
     matrixg.AddColumn("MHillasExt.fM3Long*MHillasSrc.fCosDeltaAlpha/abs(MHillasSrc.fCosDeltaAlpha)");
-    matrixg.AddColumn("MHillasSrc.fAlpha");
-
+
+    //#    matrixg.AddColumn("MHillasSrc.fAlpha");
 
     //
@@ -101 +95 @@
     TString dummy("(MHillas.fSize<");
     dummy += minsize;
+    dummy += ")";
 
     // AM, useful FOR High Energy only:
-    //    dummy += ") || (MImagePar.fNumSatPixelsLG>0";
-    dummy += ")";
+    //    dummy += " || (MImagePar.fNumSatPixelsLG>0)";
 
     MContinue SizeCut(dummy);
     tlist.AddToList(&SizeCut);
+
+    // AM TEST!!!, no muons in train
+    //    dummy = "(MMcEvt.fMuonCphFraction>0.1)";
+    //    MContinue MuonsCut(dummy);
+    //    tlist.AddToList(&MuonsCut);
 
     plist.AddToList(&matrixg);
@@ -127 +126 @@
 
     MFillH fillmatg("MatrixGammas");
-    //    fillmatg.SetFilter(&fgamma);
     fillmatg.SetFilter(&reduce_training_gammas);
     tlist.AddToList(&fillmatg);
@@ -157 +155 @@
     MTaskList tlist2;
     plist.Replace(&tlist2);
-
-    //
-    // Just a check:
-    //    matrixh.ShuffleRows(9999);
-    //    matrixg.ShuffleRows(1111);
-    //
 
     MRanForestGrow rfgrow2;
@@ -189 +181 @@
 
     evtloop.SetProgressBar(&bar);
+
     if (!evtloop.Eventloop())
         return;
@@ -219 +212 @@
     read3.AddFile("star_helium_test.root");
 
-
-    /*
-      MReadMarsFile  read3("Events", "star_gammas_test_extended.root");
-      read3.AddFile("star_protons_test_extended.root");
-      read3.AddFile("star_helium_test_extended.root");
-    */
-
     read3.DisableAutoScheme();
     tlist3.AddToList(&read3);
+
     tlist3.AddToList(&SizeCut);
 
@@ -240 +227 @@
     outfname += "_all.root";
     MWriteRootFile write(outfname, "recreate");
-
-
-    //    MWriteRootFile write("star_surviving_hadrons.root", "recreate");
-    //    MWriteRootFile write("star_surviving_gammas.root", "recreate");
-
-    //    write.AddContainer("MSigmabar", "Events");
 
     write.AddContainer("MMcEvt",         "Events");
@@ -257 +238 @@
     write.AddContainer("MRawRunHeader", "RunHeaders");
     write.AddContainer("MSrcPosCam",    "RunHeaders");
-    write.AddContainer("MMcRunHeader",        "RunHeaders");
+    write.AddContainer("MMcRunHeader",  "RunHeaders");
 
     /*