diff --git a/DDCore/src/plugins/DetectorChecksum.cpp b/DDCore/src/plugins/DetectorChecksum.cpp index ec4b13baa59c859a493892988d276bff9dd26e37..8379b069a38c245e31fdd4dcf3d014fbcc722351 100644 --- a/DDCore/src/plugins/DetectorChecksum.cpp +++ b/DDCore/src/plugins/DetectorChecksum.cpp @@ -1378,10 +1378,10 @@ static long create_checksum(Detector& description, int argc, char** argv) { wr.debug = debug; if ( dump_elements ) wr.dump_elements(); if ( dump_materials ) wr.dump_materials(); - if ( dump_solids ) wr.dump_solids(); - if ( dump_volumes ) wr.dump_volumes(); - if ( dump_placements ) wr.dump_placements(); if ( dump_detelements ) wr.dump_detelements(); + if ( dump_placements ) wr.dump_placements(); + if ( dump_volumes ) wr.dump_volumes(); + if ( dump_solids ) wr.dump_solids(); if ( dump_sensitives ) wr.dump_sensitives(); if ( dump_segmentations ) wr.dump_segmentations(); if ( dump_iddesc ) wr.dump_iddescriptors(); diff --git a/examples/CLICSiD/CMakeLists.txt b/examples/CLICSiD/CMakeLists.txt index eb98ffa3a37aaefeec13b481c43680ad324e0eeb..f4217ec6d8b3ec9829968c3400c74c71754315a2 100644 --- a/examples/CLICSiD/CMakeLists.txt +++ b/examples/CLICSiD/CMakeLists.txt @@ -132,7 +132,7 @@ endif() # Checksum test of the EcalBarrel sub-detector dd4hep_add_test_reg( CLICSiD_check_checksum_EcalBarrel COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh" - EXEC_ARGS geoPluginRun -input ${DD4hep_ROOT}/DDDetectors/compact/SiD.xml -plugin DD4hepDetectorChecksum -newline -readout -dump_detelements -debug 3 -detector EcalBarrel + EXEC_ARGS geoPluginRun -input ${DD4hep_ROOT}/DDDetectors/compact/SiD.xml -plugin DD4hepDetectorChecksum -newline -readout -dump_detelements -dump_placements -dump_solids -debug 3 -detector EcalBarrel REGEX_PASS "Combined hash code 4105a5e5b8ee5046 \\(10375 sub-codes\\)" REGEX_FAIL "Exception;EXCEPTION;ERROR" ) diff --git a/examples/DDCMS/src/plugins/DDEcalEndcapAlgo.cpp b/examples/DDCMS/src/plugins/DDEcalEndcapAlgo.cpp index 310bf433e49c55b46c1bd0697de8df6566763637..7af578192d612498d784fa2cc085d7408ec3f950 100644 --- a/examples/DDCMS/src/plugins/DDEcalEndcapAlgo.cpp +++ b/examples/DDCMS/src/plugins/DDEcalEndcapAlgo.cpp @@ -40,7 +40,7 @@ namespace { DDEcalEndcapTrap() = delete; void rotate(const DDRotationMatrix& rot); - void rotate(const DDTranslation& frontCentre, const DDTranslation& rearCentre); + //void rotate(const DDTranslation& frontCentre, const DDTranslation& rearCentre); void translate(const DDTranslation& trans); void rotateX(const double angle); @@ -59,7 +59,7 @@ namespace { void calculateCorners(); void calculateCentres(); DDRotationMatrix rotation() { return m_rotation; } - void print(); + //void print(); private: DDRotationMatrix m_rotation; @@ -144,13 +144,13 @@ namespace { calculateCentres(); } - +#if 0 void DDEcalEndcapTrap::rotate(const DDTranslation& /* frontCentre */, const DDTranslation& /* rearCentre */) { // // Rotate supercrystal to bring front and rear face centres to specified points // } - +#endif void DDEcalEndcapTrap::rotate(const DDRotationMatrix& rot) { // // Rotate supercrystal by specified rotation about (0,0,0) @@ -320,7 +320,7 @@ namespace { DDTranslation current = fcentrePos() - rcentrePos(); return polarAngle(current); } - +#if 0 void DDEcalEndcapTrap::print() { // // Print SC coordinates for debugging @@ -329,7 +329,7 @@ namespace { /* DDTranslation cc = */ cornerPos(ic); } } - +#endif namespace { struct Endcap { string mat;