From bb730ba902076087a00efd23c12e4549be90784a Mon Sep 17 00:00:00 2001 From: Tomas Herman Date: Fri, 12 Aug 2022 15:30:26 +0200 Subject: [PATCH 1/3] MFT: New json parameters added --- DATA/production/qc-async/mft.json | 3 +-- DATA/production/qc-sync/mft.json | 13 ++++++++++++- DATA/production/qc-sync/mft_track.json | 20 +++++++++++++++++++- MC/config/QC/json/qc-mft-async.json | 3 +-- MC/config/QC/json/qc-mft-cluster.json | 6 +++++- MC/config/QC/json/qc-mft-digit-0.json | 6 +++++- MC/config/QC/json/qc-mft-digit-1.json | 6 +++++- MC/config/QC/json/qc-mft-digit-2.json | 6 +++++- MC/config/QC/json/qc-mft-digit-3.json | 6 +++++- MC/config/QC/json/qc-mft-digit-4.json | 6 +++++- 10 files changed, 63 insertions(+), 12 deletions(-) diff --git a/DATA/production/qc-async/mft.json b/DATA/production/qc-async/mft.json index 589529387..769da1c55 100644 --- a/DATA/production/qc-async/mft.json +++ b/DATA/production/qc-async/mft.json @@ -40,8 +40,7 @@ "MaxTrackROFSize": "1000", "MaxClusterROFSize": "5000", "MaxDuration": "60000", - "TimeBinSize": "0.1", - "RefOrbit": "0" + "TimeBinSize": "0.1" } } }, diff --git a/DATA/production/qc-sync/mft.json b/DATA/production/qc-sync/mft.json index ae01edc44..1c1af8606 100644 --- a/DATA/production/qc-sync/mft.json +++ b/DATA/production/qc-sync/mft.json @@ -54,7 +54,11 @@ }, "taskParameters": { "FLP": "0", - "NoiseScan": "0" + "NoiseScan" : "0", + "maxDigitROFSize" : "5000", + "maxDuration" : "60000", + "timeBinSize" : "0.1", + "ROFLengthInBC" : "198" }, "location": "local", "localMachines": [ @@ -79,6 +83,13 @@ "epn", "localhost" ], + "taskParameters" : { + "maxClusterROFSize" : "5000", + "maxDuration" : "60000", + "timeBinSize" : "0.1", + "ROFLengthInBC" : "198", + "geomFileName" : "/home/epn/odc/files/o2sim_geometry-aligned.root" + }, "remoteMachine": "alio2-cr1-qme05.cern.ch", "remotePort": "47797", "localControl": "odc" diff --git a/DATA/production/qc-sync/mft_track.json b/DATA/production/qc-sync/mft_track.json index 41ed3ca74..bd489f3fc 100644 --- a/DATA/production/qc-sync/mft_track.json +++ b/DATA/production/qc-sync/mft_track.json @@ -54,7 +54,11 @@ }, "taskParameters": { "FLP": "0", - "NoiseScan": "0" + "NoiseScan" : "0", + "maxDigitROFSize" : "5000", + "maxDuration" : "60000", + "timeBinSize" : "0.1", + "ROFLengthInBC" : "198" }, "location": "local", "localMachines": [ @@ -79,6 +83,13 @@ "epn", "localhost" ], + "taskParameters" : { + "maxClusterROFSize" : "5000", + "maxDuration" : "60000", + "timeBinSize" : "0.1", + "ROFLengthInBC" : "198", + "geomFileName" : "/home/epn/odc/files/o2sim_geometry-aligned.root" + }, "remoteMachine": "alio2-cr1-qme05.cern.ch", "remotePort": "47797", "localControl": "odc" @@ -99,6 +110,13 @@ "epn", "localhost" ], + "taskParameters" : { + "ROFLengthInBC": "198", + "MaxTrackROFSize": "1000", + "MaxClusterROFSize": "5000", + "MaxDuration": "60000", + "TimeBinSize": "0.1" + }, "remoteMachine": "alio2-cr1-qme05.cern.ch", "remotePort": "47796", "localControl": "odc" diff --git a/MC/config/QC/json/qc-mft-async.json b/MC/config/QC/json/qc-mft-async.json index 00d0c5734..8e889a454 100644 --- a/MC/config/QC/json/qc-mft-async.json +++ b/MC/config/QC/json/qc-mft-async.json @@ -42,8 +42,7 @@ "MaxTrackROFSize": "1000", "MaxClusterROFSize": "5000", "MaxDuration": "60000", - "TimeBinSize": "0.1", - "RefOrbit": "0" + "TimeBinSize": "0.1" }, "location": "remote" } diff --git a/MC/config/QC/json/qc-mft-cluster.json b/MC/config/QC/json/qc-mft-cluster.json index 0f7724eed..bfc45e773 100644 --- a/MC/config/QC/json/qc-mft-cluster.json +++ b/MC/config/QC/json/qc-mft-cluster.json @@ -39,7 +39,11 @@ "query": "randomcluster:MFT/COMPCLUSTERS/0;clustersrof:MFT/CLUSTERSROF/0;patterns:MFT/PATTERNS/0" }, "taskParameters": { - "myOwnKey": "myOwnValue" + "maxClusterROFSize" : "5000", + "maxDuration" : "60000", + "timeBinSize" : "0.1", + "ROFLengthInBC" : "198", + "geomFileName" : "/home/epn/odc/files/o2sim_geometry-aligned.root" }, "location": "remote" } diff --git a/MC/config/QC/json/qc-mft-digit-0.json b/MC/config/QC/json/qc-mft-digit-0.json index 194d63bf2..c8f3e0418 100644 --- a/MC/config/QC/json/qc-mft-digit-0.json +++ b/MC/config/QC/json/qc-mft-digit-0.json @@ -40,7 +40,11 @@ }, "taskParameters": { "FLP": "0", - "TaskLevel": "0" + "NoiseScan" : "0", + "maxDigitROFSize" : "5000", + "maxDuration" : "60000", + "timeBinSize" : "0.1", + "ROFLengthInBC" : "198" }, "location": "remote" } diff --git a/MC/config/QC/json/qc-mft-digit-1.json b/MC/config/QC/json/qc-mft-digit-1.json index 78e11f0c4..f0f3a1ba6 100644 --- a/MC/config/QC/json/qc-mft-digit-1.json +++ b/MC/config/QC/json/qc-mft-digit-1.json @@ -40,7 +40,11 @@ }, "taskParameters": { "FLP": "1", - "TaskLevel": "0" + "NoiseScan" : "0", + "maxDigitROFSize" : "5000", + "maxDuration" : "60000", + "timeBinSize" : "0.1", + "ROFLengthInBC" : "198" }, "location": "remote" } diff --git a/MC/config/QC/json/qc-mft-digit-2.json b/MC/config/QC/json/qc-mft-digit-2.json index f4bc75021..0963c092b 100644 --- a/MC/config/QC/json/qc-mft-digit-2.json +++ b/MC/config/QC/json/qc-mft-digit-2.json @@ -40,7 +40,11 @@ }, "taskParameters": { "FLP": "2", - "TaskLevel": "0" + "NoiseScan" : "0", + "maxDigitROFSize" : "5000", + "maxDuration" : "60000", + "timeBinSize" : "0.1", + "ROFLengthInBC" : "198" }, "location": "remote" } diff --git a/MC/config/QC/json/qc-mft-digit-3.json b/MC/config/QC/json/qc-mft-digit-3.json index 6fae731db..036c9802d 100644 --- a/MC/config/QC/json/qc-mft-digit-3.json +++ b/MC/config/QC/json/qc-mft-digit-3.json @@ -40,7 +40,11 @@ }, "taskParameters": { "FLP": "3", - "TaskLevel": "0" + "NoiseScan" : "0", + "maxDigitROFSize" : "5000", + "maxDuration" : "60000", + "timeBinSize" : "0.1", + "ROFLengthInBC" : "198" }, "location": "remote" } diff --git a/MC/config/QC/json/qc-mft-digit-4.json b/MC/config/QC/json/qc-mft-digit-4.json index e79a24b16..943a28a95 100644 --- a/MC/config/QC/json/qc-mft-digit-4.json +++ b/MC/config/QC/json/qc-mft-digit-4.json @@ -40,7 +40,11 @@ }, "taskParameters": { "FLP": "4", - "TaskLevel": "0" + "NoiseScan" : "0", + "maxDigitROFSize" : "5000", + "maxDuration" : "60000", + "timeBinSize" : "0.1", + "ROFLengthInBC" : "198" }, "location": "remote" } From f6731674aba6368f829ef8e89eb078762218aa75 Mon Sep 17 00:00:00 2001 From: Tomas Herman Date: Fri, 12 Aug 2022 17:02:10 +0200 Subject: [PATCH 2/3] Remove full path to geometry file --- MC/config/QC/json/qc-mft-cluster.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/config/QC/json/qc-mft-cluster.json b/MC/config/QC/json/qc-mft-cluster.json index bfc45e773..abf85f25a 100644 --- a/MC/config/QC/json/qc-mft-cluster.json +++ b/MC/config/QC/json/qc-mft-cluster.json @@ -43,7 +43,7 @@ "maxDuration" : "60000", "timeBinSize" : "0.1", "ROFLengthInBC" : "198", - "geomFileName" : "/home/epn/odc/files/o2sim_geometry-aligned.root" + "geomFileName" : "o2sim_geometry-aligned.root" }, "location": "remote" } From fc762808e99060686f1e1d68d7c6d6242b2002bb Mon Sep 17 00:00:00 2001 From: Tomas Herman Date: Sat, 13 Aug 2022 13:31:18 +0200 Subject: [PATCH 3/3] Removing the full geometry file path also from qs sync json files --- DATA/production/qc-sync/mft.json | 2 +- DATA/production/qc-sync/mft_track.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DATA/production/qc-sync/mft.json b/DATA/production/qc-sync/mft.json index 1c1af8606..167761958 100644 --- a/DATA/production/qc-sync/mft.json +++ b/DATA/production/qc-sync/mft.json @@ -88,7 +88,7 @@ "maxDuration" : "60000", "timeBinSize" : "0.1", "ROFLengthInBC" : "198", - "geomFileName" : "/home/epn/odc/files/o2sim_geometry-aligned.root" + "geomFileName" : "o2sim_geometry-aligned.root" }, "remoteMachine": "alio2-cr1-qme05.cern.ch", "remotePort": "47797", diff --git a/DATA/production/qc-sync/mft_track.json b/DATA/production/qc-sync/mft_track.json index bd489f3fc..cc3e687d3 100644 --- a/DATA/production/qc-sync/mft_track.json +++ b/DATA/production/qc-sync/mft_track.json @@ -88,7 +88,7 @@ "maxDuration" : "60000", "timeBinSize" : "0.1", "ROFLengthInBC" : "198", - "geomFileName" : "/home/epn/odc/files/o2sim_geometry-aligned.root" + "geomFileName" : "o2sim_geometry-aligned.root" }, "remoteMachine": "alio2-cr1-qme05.cern.ch", "remotePort": "47797",