From e0b7caba26bcf8268dbf825dd05010d6e166d01b Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Fri, 17 Mar 2017 19:42:30 +0100
Subject: [PATCH] Cleanup and extending the data parsers for XML/JSON add
example ClientTests/MiniTel_json
---
examples/ClientTests/CMakeLists.txt | 3 ++-
examples/ClientTests/compact/MiniTel.json | 20 ++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index e4aa705c1..79c0a5f25 100644
--- a/examples/ClientTests/CMakeLists.txt
+++ b/examples/ClientTests/CMakeLists.txt
@@ -33,7 +33,8 @@ dd4hep_configure_scripts( ClientTests DEFAULT_SETUP WITH_TESTS)
dd4hep_add_test_reg( ClientTests_MiniTel_JSON
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
EXEC_ARGS geoDisplay
- -input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/MiniTel_json.xml -volmgr -destroy -load_only
+ -input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/MiniTel_json.xml
+ -volmgr -destroy -load_only
REGEX_PASS "Successfully processed JSON input"
REGEX_FAIL "Exception"
REGEX_FAIL "FAILED"
diff --git a/examples/ClientTests/compact/MiniTel.json b/examples/ClientTests/compact/MiniTel.json
index ffe00a5fa..d0746cffa 100644
--- a/examples/ClientTests/compact/MiniTel.json
+++ b/examples/ClientTests/compact/MiniTel.json
@@ -19,7 +19,7 @@
"vis": "DetVis",
"readout": "MyLHCBdetector1Hits",
"dimensions": { "z": "1*mm", "y": "10*cm", "x": "10*cm" },
- "position": { "z": "0*mm", "y": "0*cm", "x": "0*cm" },
+ "position": { "z": "0*mm", "y": "0*cm", "x": "0*cm" },
"module": {
"name": "pixel",
"type:": "MiniTelPixel",
@@ -42,7 +42,7 @@
"vis": "DetVis",
"readout": "MyLHCBdetector1Hits",
"dimensions": { "z": "1*mm", "y": "10*cm", "x": "10*cm" },
- "position": { "z": "10*mm", "y": "0*cm", "x": "0*cm" },
+ "position": { "z": "10*mm", "y": "0*cm", "x": "0*cm" },
"module": {
"name": "pixel",
"type:": "MiniTelPixel",
@@ -65,7 +65,7 @@
"vis": "DetVis",
"readout": "MyLHCBdetector1Hits",
"dimensions": { "z": "1*mm", "y": "10*cm", "x": "10*cm" },
- "position": { "z": "20*mm", "y": "0*cm", "x": "0*cm" },
+ "position": { "z": "20*mm", "y": "0*cm", "x": "0*cm" },
"module": {
"name": "pixel",
"type:": "MiniTelPixel",
@@ -88,7 +88,7 @@
"vis": "DetVis",
"readout": "MyLHCBdetector1Hits",
"dimensions": { "z": "1*mm", "y": "10*cm", "x": "10*cm" },
- "position": { "z": "30*mm", "y": "0*cm", "x": "0*cm" },
+ "position": { "z": "30*mm", "y": "0*cm", "x": "0*cm" },
"module": {
"name": "pixel",
"type:": "MiniTelPixel",
@@ -111,7 +111,7 @@
"vis": "DetVis",
"readout": "MyLHCBdetector1Hits",
"dimensions": { "z": "1*mm", "y": "10*cm", "x": "10*cm" },
- "position": { "z": "40*mm", "y": "0*cm", "x": "0*cm" },
+ "position": { "z": "40*mm", "y": "0*cm", "x": "0*cm" },
"module": {
"name": "pixel",
"type:": "MiniTelPixel",
@@ -134,7 +134,7 @@
"vis": "DetVis",
"readout": "MyLHCBdetector1Hits",
"dimensions": { "z": "1*mm", "y": "10*cm", "x": "10*cm" },
- "position": { "z": "50*mm", "y": "0*cm", "x": "0*cm" },
+ "position": { "z": "50*mm", "y": "0*cm", "x": "0*cm" },
"module": {
"name": "pixel",
"type:": "MiniTelPixel",
@@ -157,7 +157,7 @@
"vis": "DetVis",
"readout": "MyLHCBdetector1Hits",
"dimensions": { "z": "1*mm", "y": "10*cm", "x": "10*cm" },
- "position": { "z": "60*mm", "y": "0*cm", "x": "0*cm" },
+ "position": { "z": "60*mm", "y": "0*cm", "x": "0*cm" },
"module": {
"name": "pixel",
"type:": "MiniTelPixel",
@@ -180,7 +180,7 @@
"vis": "DetVis",
"readout": "MyLHCBdetector1Hits",
"dimensions": { "z": "1*mm", "y": "10*cm", "x": "10*cm" },
- "position": { "z": "70*mm", "y": "0*cm", "x": "0*cm" },
+ "position": { "z": "70*mm", "y": "0*cm", "x": "0*cm" },
"module": {
"name": "pixel",
"type:": "MiniTelPixel",
@@ -203,7 +203,7 @@
"vis": "DetVis",
"readout": "MyLHCBdetector1Hits",
"dimensions": { "z": "1*mm", "y": "10*cm", "x": "10*cm" },
- "position": { "z": "80*mm", "y": "0*cm", "x": "0*cm" },
+ "position": { "z": "80*mm", "y": "0*cm", "x": "0*cm" },
"module": {
"name": "pixel",
"type:": "MiniTelPixel",
@@ -226,7 +226,7 @@
"vis": "DetVis",
"readout": "MyLHCBdetector1Hits",
"dimensions": { "z": "1*mm", "y": "10*cm", "x": "10*cm" },
- "position": { "z": "90*mm", "y": "0*cm", "x": "0*cm" },
+ "position": { "z": "90*mm", "y": "0*cm", "x": "0*cm" },
"module": {
"name": "pixel",
"type:": "MiniTelPixel",
--
GitLab