Add print options in genbb::primary_particle and mctools::simulated_data

Author: fmauger

source/bxgenbb_help/src/primary_event.cc

@@ -395,6 +395,7 @@ namespace genbb {
     base_print_options popts;
     popts.configure_from(options_);
     std::ostringstream outs;
+    bool list_particles = options_.get<bool>("list_particles", true);
     if (! popts.title.empty ()) {
       outs << popts.indent << popts.title << std::endl;
     }
@@ -422,29 +423,30 @@ namespace genbb {
     outs << std::endl;
 
     outs << popts.indent << tag << "Particles: [" << _particles_.size() << "]" << std::endl;
-
-    int particle_counter = 0;
-    for (particles_col_type::const_iterator it = _particles_.begin();
-         it != _particles_.end();
-         it++) {
-      std::ostringstream indent_oss;
-      indent_oss << popts.indent << skip_tag;
-      particles_col_type::const_iterator jt = it;
-      jt++;
-      outs << popts.indent << skip_tag;
-      if (jt == _particles_.end()) {
-        outs << last_tag;
-        indent_oss << last_skip_tag;
-      } else {
-        outs << tag;
-        indent_oss << skip_tag;
+    if (list_particles) {
+      int particle_counter = 0;
+      for (particles_col_type::const_iterator it = _particles_.begin();
+	   it != _particles_.end();
+	   it++) {
+	std::ostringstream indent_oss;
+	indent_oss << popts.indent << skip_tag;
+	particles_col_type::const_iterator jt = it;
+	jt++;
+	outs << popts.indent << skip_tag;
+	if (jt == _particles_.end()) {
+	  outs << last_tag;
+	  indent_oss << last_skip_tag;
+	} else {
+	  outs << tag;
+	  indent_oss << skip_tag;
+	}
+	outs << "Particle #" << particle_counter << " : " << std::endl;
+	boost::property_tree::ptree popts2;
+	popts2.put("indent", indent_oss.str());
+	it->print_tree(outs, popts2);
+	// it->tree_dump(outs, "", indent_oss.str());
+	particle_counter++;
       }
-      outs << "Particle #" << particle_counter << " : " << std::endl;
-      boost::property_tree::ptree popts2;
-      popts2.put("indent", indent_oss.str());
-      it->print_tree(outs, popts2);
-      // it->tree_dump(outs, "", indent_oss.str());
-      particle_counter++;
     }
     outs << popts.indent << tag
          << "GENBB weight : " << get_genbb_weight()

source/bxmctools/src/simulated_data.cc

@@ -581,6 +581,7 @@ namespace mctools {
     datatools::i_tree_dumpable::base_print_options popts;
     popts.configure_from(options_);
     bool hit_list  = options_.get<bool>("list_hits", false);
+    bool primary_particle_list  = options_.get<bool>("list_primary_particles", false);
     if (! popts.title.empty ()) {
       out_ << popts.indent << popts.title << std::endl;
     }
@@ -699,12 +700,16 @@ namespace mctools {
     // Primary event:
     {
       out_ << popts.indent << datatools::i_tree_dumpable::tag
-            << "Primary event : " << std::endl;
+	   << "Primary event : "
+	   << std::endl;
       {
         std::ostringstream indent_oss;
         indent_oss << popts.indent;
         indent_oss << datatools::i_tree_dumpable::skip_tag;
-        _primary_event_.tree_dump(out_, "", indent_oss.str());
+	boost::property_tree::ptree pe_options;
+	pe_options.put("indent", indent_oss.str());
+	pe_options.put("list_particles", primary_particle_list);
+        _primary_event_.print_tree(out_, pe_options);
       }
     }