Changeset 3534

Timestamp:

03/17/04 14:29:31 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/starmc.C (modified) (3 diffs)
• manalysis/MSourcePosfromStarPos.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/03/17: Abelardo Moralejo
+
+   * manalysis/MSourcePosfromStarPos.cc
+     - added cast fabs((Double_t)ival), line 703. Otherwise it does not
+       compile.
+
+   * macros/starmc.C
+     - added parameter accepted_fraction to select fraction of events 
+       to be processed (useful to make smaller outputs).
+
 
  2004/03/17: Wolfgang Wittek

trunk/MagicSoft/Mars/macros/starmc.C

@@ -52 +52 @@
   // differences in gain of outer pixels)
   //
-  CalibrationFilename = new TString("nonoise/Gamma_zbin0_90_7_507*.root");
+  CalibrationFilename = new TString("nonoise/Gamma_zbin0_90_*.root");
   // File to be used in the calibration (must be a camera file without added noise)
 
-  Char_t* AnalysisFilename = "Gamma_zbin0*.root";  // File to be analyzed
+  Char_t* AnalysisFilename = "Gamma_zbin*.root";  // File to be analyzed
 
   // ------------- user change -----------------
@@ -63 +63 @@
 
   OutFilename1 = new TString("star_train.root");   // Output file name 1 (test)
-  //  OutFilename2 = new TString("star_test.root");    // Output file name 2 (train)
-
+  OutFilename2 = new TString("star_test.root");    // Output file name 2 (train)
+  //
+  // Fraction of events (taken at random) which one wants to process from the 
+  // file to be analyzed (useful to make smaller files if starting sample is
+  // too large).
+  //
+  Float_t accepted_fraction = 1.;
 
   Float_t CleanLev[2] = {4., 3.}; // Tail cuts for image analysis
@@ -206 +211 @@
   read2.AddFile(AnalysisFilename);
   read2.DisableAutoScheme();
-  tlist.AddToListBefore(&read2, &read, "All");
+  tlist.AddToListBefore(&read2, &read);
   tlist.RemoveFromList(&read);
+
+  //
+  // Analyzed only the desired fraction of events, skip the rest:
+  //
+  MFEventSelector eventselector;
+  Float_t rejected_fraction = 1. - accepted_fraction; 
+  eventselector.SetSelectionRatio(rejected_fraction);
+  MContinue skip(&eventselector);
+  tlist.AddToListBefore(&skip, &sigextract);
 
   bar.SetWindowName("Analyzing...");

trunk/MagicSoft/Mars/manalysis/MSourcePosfromStarPos.cc

@@ -701 +701 @@
 
     // run number must be greater than 10000
-    if (fabs(ival) < 10000)
+    if (fabs((Double_t)ival) < 10000)
     {
       *fLog << err << "===========> Error when reading file with theta and phi <========="