From ff9ff9ccecb9abf2c34253bea67a4e9f88e74255 Mon Sep 17 00:00:00 2001 From: Giovanna Lazzari Miotto <giovanna.lazzari.miotto@cern.ch> Date: Wed, 18 Sep 2024 18:47:16 +0200 Subject: [PATCH] config: Enable cmssw headers in dev config --- ...mt-muon-cmssw.json5 => dev-file-jet.json5} | 20 +++++++++---------- ...gmt-muon-dev.json5 => dev-file-muon.json5} | 4 ++-- ...alo-tau-cmssw.json5 => dev-file-tau.json5} | 10 +++++----- ...-gmt-muon-dev.json5 => dev-tcp-muon.json5} | 0 4 files changed, 17 insertions(+), 17 deletions(-) rename test/config/{filedma-gmt-muon-cmssw.json5 => dev-file-jet.json5} (88%) rename test/config/{filedma-gmt-muon-dev.json5 => dev-file-muon.json5} (98%) rename test/config/{filedma-calo-tau-cmssw.json5 => dev-file-tau.json5} (94%) rename test/config/{tcp-gmt-muon-dev.json5 => dev-tcp-muon.json5} (100%) diff --git a/test/config/filedma-gmt-muon-cmssw.json5 b/test/config/dev-file-jet.json5 similarity index 88% rename from test/config/filedma-gmt-muon-cmssw.json5 rename to test/config/dev-file-jet.json5 index ddae371a..5d89a1fe 100644 --- a/test/config/filedma-gmt-muon-cmssw.json5 +++ b/test/config/dev-file-jet.json5 @@ -1,4 +1,4 @@ -// filedma-gmt-muon.json5 +// filedma-gmt-jet.json5 { // Input settings ////////////////////////////////////////////////// // Input type, one of: @@ -20,7 +20,7 @@ // Extra settings for "filedma" input input_files: [ // Must have at least the same cardinality as input_streams; kept isolated since `FileDMA` is a development feature - "test/data/testfiles/gmt_muon_testfile.dat" + "test/data/testfiles/jet-65k-1.dat" ], // Processing types (unpacking): // PASS_THROUGH, GMT, CALO, CALOOBJ, CALOSUM, BMTF, UGT, BRIL @@ -28,10 +28,10 @@ // NONE, MUON, JET, EGAMMA, TAU, SUM, STUB, ALGOBIT input_streams: [ { - processor_type: "GMT", - primitive_type: "MUON", - source_id: 1, - tcp_dest_port: 10000 + processor_type: "CALOOBJ", + primitive_type: "JET", + source_id: 2, + tcp_dest_port: 12666 } ], // Processor settings ////////////////////////////////////////////// @@ -39,22 +39,22 @@ // Enable software zero-suppression. Does not affect Calo. doZS: "yes", // Output settings ///////////////////////////////////////////////// - output_filename_prefix: "scout_MUON", + output_filename_prefix: "scout_JET", output_filename_base: "test/data", output_filename_suffix: ".raw", max_file_size: 8589934592, // Always write data to a file regardless of the run status output_force_write: "yes", // Generic settings //////////////////////////////////////////////// - port: 8000, + port: 12000, dev_TCPAutoReconnectOnFailure: "false", // (Minimum) Logging severity: TRACE DEBUG INFO WARNING ERROR FATAL. // Use TRACE to log everything. - log_min_severity: "ERROR", + log_min_severity: "TRACE", threads: 8, // Stores fixed number of orbits per file when nOrbitsPerFile > 1 // If zero, uses a fixed file size (`max_file_size`) instead - nOrbitsPerFile: 64, + nOrbitsPerFile: 1024, cmsswHeaders: "yes", dthHeaders: "yes", source_id: 1, diff --git a/test/config/filedma-gmt-muon-dev.json5 b/test/config/dev-file-muon.json5 similarity index 98% rename from test/config/filedma-gmt-muon-dev.json5 rename to test/config/dev-file-muon.json5 index d9fc319b..b6b1d2fb 100644 --- a/test/config/filedma-gmt-muon-dev.json5 +++ b/test/config/dev-file-muon.json5 @@ -54,8 +54,8 @@ threads: 8, // Stores fixed number of orbits per file when nOrbitsPerFile > 1 // If zero, uses a fixed file size (`max_file_size`) instead - nOrbitsPerFile: 128, - cmsswHeaders: "no", + nOrbitsPerFile: 1024, + cmsswHeaders: "yes", dthHeaders: "yes", source_id: 1, // Information necessary to issue a reset request for the board diff --git a/test/config/filedma-calo-tau-cmssw.json5 b/test/config/dev-file-tau.json5 similarity index 94% rename from test/config/filedma-calo-tau-cmssw.json5 rename to test/config/dev-file-tau.json5 index aa9b2cb4..a0fa658a 100644 --- a/test/config/filedma-calo-tau-cmssw.json5 +++ b/test/config/dev-file-tau.json5 @@ -20,7 +20,7 @@ // Extra settings for "filedma" input input_files: [ // Must have at least the same cardinality as input_streams; kept isolated since `FileDMA` is a development feature - "test/data/testfiles/calo_tau_testfile.dat" + "test/data/testfiles/tau-65k-1.dat" ], // Processing types (unpacking): // PASS_THROUGH, GMT, CALO, CALOOBJ, CALOSUM, BMTF, UGT, BRIL @@ -31,7 +31,7 @@ processor_type: "CALOOBJ", primitive_type: "TAU", source_id: 2, - tcp_dest_port: 10000 + tcp_dest_port: 12666 } ], // Processor settings ////////////////////////////////////////////// @@ -46,15 +46,15 @@ // Always write data to a file regardless of the run status output_force_write: "yes", // Generic settings //////////////////////////////////////////////// - port: 8000, + port: 12000, dev_TCPAutoReconnectOnFailure: "false", // (Minimum) Logging severity: TRACE DEBUG INFO WARNING ERROR FATAL. // Use TRACE to log everything. - log_min_severity: "ERROR", + log_min_severity: "TRACE", threads: 8, // Stores fixed number of orbits per file when nOrbitsPerFile > 1 // If zero, uses a fixed file size (`max_file_size`) instead - nOrbitsPerFile: 64, + nOrbitsPerFile: 1024, cmsswHeaders: "yes", dthHeaders: "yes", source_id: 2, diff --git a/test/config/tcp-gmt-muon-dev.json5 b/test/config/dev-tcp-muon.json5 similarity index 100% rename from test/config/tcp-gmt-muon-dev.json5 rename to test/config/dev-tcp-muon.json5 -- GitLab