Polishing rdh printout

matthiasrichter · matthiasrichter · commit 1b63836fddca · 2019-12-05T08:06:00.000+01:00
diff --git a/Framework/Utils/include/DPLUtils/RawParser.h b/Framework/Utils/include/DPLUtils/RawParser.h
@@ -439,7 +439,7 @@ class RawParser
 
     friend std::ostream& operator<<(std::ostream& os, self_type const& it)
     {
-      std::visit([&os](auto& parser) { return parser.format(os); }, it.mParser);
+      std::visit([&os](auto& parser) { return parser.format(os, raw_parser::FormatSpec::Entry, ""); }, it.mParser);
       return os;
     }
 
diff --git a/Framework/Utils/src/raw-parser.cxx b/Framework/Utils/src/raw-parser.cxx
@@ -17,6 +17,7 @@
 #include "DPLUtils/RawParser.h"
 #include "Headers/DataHeader.h"
 #include <vector>
+#include <sstream>
 
 using namespace o2::framework;
 
@@ -32,38 +33,48 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
 
 WorkflowSpec defineDataProcessing(ConfigContext const& config)
 {
-
   WorkflowSpec workflow;
   workflow.emplace_back(DataProcessorSpec{
     "raw-parser",
     select(config.options().get<std::string>("input-spec").c_str()),
     Outputs{},
-    AlgorithmSpec{[](InitContext& setup) { return adaptStateless([](InputRecord& inputs, DataAllocator& outputs) {
-                                             for (auto& input : inputs) {
-                                               const auto* dh = DataRefUtils::getHeader<o2::header::DataHeader*>(input);
-                                               // InputSpec implements operator<< so we could print (input.spec) but that is the
-                                               // matcher instead of the matched data
-                                               LOG(INFO) << dh->dataOrigin.as<std::string>() << "/"
-                                                         << dh->dataDescription.as<std::string>() << "/"
-                                                         << dh->subSpecification << " payload size " << dh->payloadSize;
+    AlgorithmSpec{[](InitContext& setup) {
+	auto loglevel = setup.options().get<int>("log-level");
+	return adaptStateless([loglevel](InputRecord& inputs, DataAllocator& outputs) {
+	    for (auto& input : inputs) {
+	      const auto* dh = DataRefUtils::getHeader<o2::header::DataHeader*>(input);
+	      if (loglevel > 0) {
+		// InputSpec implements operator<< so we could print (input.spec) but that is the
+		// matcher instead of the matched data
+		LOG(INFO) << dh->dataOrigin.as<std::string>() << "/"
+			  << dh->dataDescription.as<std::string>() << "/"
+			  << dh->subSpecification << " payload size " << dh->payloadSize;
+	      }
+
+	      // there is a bug in InpuRecord::get for vectors of simple types, not catched in
+	      // DataAllocator unit test
+	      //auto data = inputs.get<std::vector<char>>(input.spec->binding.c_str());
+	      //LOG(INFO) << "data size " << data.size();
 
-                                               // there is a bug in InpuRecord::get for vectors of simple types, not catched in
-                                               // DataAllocator unit test
-                                               //auto data = inputs.get<std::vector<char>>(input.spec->binding.c_str());
-                                               //LOG(INFO) << "data size " << data.size();
-                                               try {
-                                                 o2::framework::RawParser parser(input.payload, dh->payloadSize);
+	      try {
+		o2::framework::RawParser parser(input.payload, dh->payloadSize);
 
-                                                 LOG(INFO) << parser << std::endl;
-                                                 for (auto it = parser.begin(), end = parser.end(); it != end; ++it) {
-                                                   LOG(INFO) << it << ": block length " << it.length() << std::endl;
-                                                 }
-                                               } catch (const std::runtime_error& e) {
-                                                 LOG(ERROR) << "can not create raw parser form input data";
-                                                 o2::header::hexDump("payload", input.payload, dh->payloadSize, 64);
-                                                 LOG(ERROR) << e.what();
-                                               }
-                                             }
-                                           }); }}});
+		std::stringstream rdhprintout;
+		rdhprintout << parser;
+		for (auto it = parser.begin(), end = parser.end(); it != end; ++it) {
+		  rdhprintout << it << ": block length " << it.length() << std::endl;
+		}
+		if (loglevel > 1) {
+		  LOG(INFO) << rdhprintout.str();
+		}
+	      } catch (const std::runtime_error& e) {
+		LOG(ERROR) << "can not create raw parser form input data";
+		o2::header::hexDump("payload", input.payload, dh->payloadSize, 64);
+		LOG(ERROR) << e.what();
+	      }
+	    }
+	  }); }},
+    Options{
+      {"log-level", VariantType::Int, 1, {"Logging level [0-2]"}}}});
   return workflow;
 }

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ class RawParser`
`439`	`439`
`440`	`440`	`friend std::ostream& operator<<(std::ostream& os, self_type const& it)`
`441`	`441`	`{`
`442`		`- std::visit([&os](auto& parser) { return parser.format(os); }, it.mParser);`
	`442`	`+ std::visit([&os](auto& parser) { return parser.format(os, raw_parser::FormatSpec::Entry, ""); }, it.mParser);`
`443`	`443`	`return os;`
`444`	`444`	`}`
`445`	`445`