Update TRD digit and tracklet print methods

martenole · davidrohr · commit c4796cbb6518 · 2022-06-30T13:53:21.000+02:00
diff --git a/DataFormats/Detectors/TRD/src/Digit.cxx b/DataFormats/Detectors/TRD/src/Digit.cxx
@@ -70,7 +70,7 @@ ADC_t Digit::getADCmax(int& idx) const
 
 std::ostream& operator<<(std::ostream& stream, const Digit& d)
 {
-  stream << "Digit Det: " << d.getDetector() << " ROB: " << d.getROB() << " MCM: " << d.getMCM() << " Channel: " << d.getChannel() << " ADCs:";
+  stream << "Digit Det: " << HelperMethods::getSector(d.getDetector()) << "_" << HelperMethods::getStack(d.getDetector()) << "_" << HelperMethods::getLayer(d.getDetector()) << " pad row: " << d.getPadRow() << " pad column: " << d.getPadCol() << " Channel: " << d.getChannel() << " ADCs:";
   for (int i = 0; i < constants::TIMEBINS; i++) {
     stream << "[" << d.getADC()[i] << "]";
   }
diff --git a/DataFormats/Detectors/TRD/src/Tracklet64.cxx b/DataFormats/Detectors/TRD/src/Tracklet64.cxx
@@ -11,6 +11,7 @@
 
 #include "DataFormatsTRD/Tracklet64.h"
 #include "DataFormatsTRD/Constants.h"
+#include "DataFormatsTRD/HelperMethods.h"
 
 #include "fairlogger/Logger.h"
 #include <iostream>
@@ -25,8 +26,8 @@ using namespace constants;
 
 void Tracklet64::print() const
 {
-  LOGF(info, "trackletWord(0x%x), hcid(%i), row(%i), col(%i), position(%i), slope(%i), pid(%i), q0(%i), q1(%i), q2(%i)",
-       getTrackletWord(), getHCID(), getPadRow(), getColumn(), getPosition(), getSlope(), getPID(), getQ0(), getQ1(), getQ2());
+  LOGF(info, "%02i_%i_%i, row(%i), col(%i), position(%i), slope(%i), pid(%i), q0(%i), q1(%i), q2(%i)",
+       HelperMethods::getSector(getDetector()), HelperMethods::getStack(getDetector()), HelperMethods::getLayer(getDetector()), getPadRow(), getColumn(), getPosition(), getSlope(), getPID(), getQ0(), getQ1(), getQ2());
 }
 
 #ifndef GPUCA_GPUCODE_DEVICE

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ ADC_t Digit::getADCmax(int& idx) const`
`70`	`70`
`71`	`71`	`std::ostream& operator<<(std::ostream& stream, const Digit& d)`
`72`	`72`	`{`
`73`		`- stream << "Digit Det: " << d.getDetector() << " ROB: " << d.getROB() << " MCM: " << d.getMCM() << " Channel: " << d.getChannel() << " ADCs:";`
	`73`	`+ stream << "Digit Det: " << HelperMethods::getSector(d.getDetector()) << "_" << HelperMethods::getStack(d.getDetector()) << "_" << HelperMethods::getLayer(d.getDetector()) << " pad row: " << d.getPadRow() << " pad column: " << d.getPadCol() << " Channel: " << d.getChannel() << " ADCs:";`
`74`	`74`	`for (int i = 0; i < constants::TIMEBINS; i++) {`
`75`	`75`	`stream << "[" << d.getADC()[i] << "]";`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`#include "DataFormatsTRD/Tracklet64.h"`
`13`	`13`	`#include "DataFormatsTRD/Constants.h"`
	`14`	`+#include "DataFormatsTRD/HelperMethods.h"`
`14`	`15`
`15`	`16`	`#include "fairlogger/Logger.h"`
`16`	`17`	`#include <iostream>`
`@@ -25,8 +26,8 @@ using namespace constants;`
`25`	`26`
`26`	`27`	`void Tracklet64::print() const`
`27`	`28`	`{`
`28`		`- LOGF(info, "trackletWord(0x%x), hcid(%i), row(%i), col(%i), position(%i), slope(%i), pid(%i), q0(%i), q1(%i), q2(%i)",`
`29`		`- getTrackletWord(), getHCID(), getPadRow(), getColumn(), getPosition(), getSlope(), getPID(), getQ0(), getQ1(), getQ2());`
	`29`	`+ LOGF(info, "%02i_%i_%i, row(%i), col(%i), position(%i), slope(%i), pid(%i), q0(%i), q1(%i), q2(%i)",`
	`30`	`+ HelperMethods::getSector(getDetector()), HelperMethods::getStack(getDetector()), HelperMethods::getLayer(getDetector()), getPadRow(), getColumn(), getPosition(), getSlope(), getPID(), getQ0(), getQ1(), getQ2());`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`#ifndef GPUCA_GPUCODE_DEVICE`