Added in shuttle_schema:

- triggerWait: time to wait for DIM trigger (s) before starting collection of new runs automatically
- mode: run mode (test or prod)

diff --git a/SHUTTLE/schema/Global.ldif b/SHUTTLE/schema/Global.ldif
index 845632194f295d83d434aa1e518ed0fd209828b3..7a80f25dd11d3cf0cef8c6941971cae480edf9c7 100644 (file)
--- a/SHUTTLE/schema/Global.ldif
+++ b/SHUTTLE/schema/Global.ldif
@@ -16,4 +16,5 @@ ppMaxMem: 2097152
 ppMaxRetries: 2
 monitorHost: aliendb1.cern.ch
 monitorTable: SHUTTLE
-
+triggerWait: 10
+mode: test

diff --git a/SHUTTLE/schema/shuttle.schema b/SHUTTLE/schema/shuttle.schema
index 590f047c6218b6c73a913cecbcfcdb3baa2eba85..d16b755c2c79a0446b0fb4892659a13300d64d41 100644 (file)
--- a/SHUTTLE/schema/shuttle.schema
+++ b/SHUTTLE/schema/shuttle.schema
@@ -65,13 +65,16 @@ attributetype ( GLOBAL_CONFIG:10 NAME 'ppTimeOut'      DESC 'seconds before pp a
 attributetype ( GLOBAL_CONFIG:11 NAME 'ppMaxMem'       DESC 'max pp mem consumption (KB)'  EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
 attributetype ( GLOBAL_CONFIG:12 NAME 'monitorHost'    DESC 'monitoring server host'       EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
 attributetype ( GLOBAL_CONFIG:13 NAME 'monitorTable'   DESC 'monitoring table name'        EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:14 NAME 'triggerWait'    DESC 'max time waiting for next trigger before starting a new collection'   
+                                                                                          EQUALITY integerMatch       SUP uidNumber SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:15 NAME 'mode'           DESC 'production mode (test, prod)' EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
 
 objectclass ( GLOBAL_CONFIG
         NAME 'globalConfig'
         DESC 'ALICE: settings for DAQ logbook access'
         SUP top
         MUST (name $ daqLbHost $ daqLbUser $ daqLbPasswd $ daqLbDB $ daqLbTable $ shuttleLbTable $ runTypeLbTable $ ppMaxRetries $ ppTimeOut $ ppMaxMem $ monitorHost $ monitorTable)
-        MAY ( daqLbPort ) )
+        MAY ( daqLbPort $ triggerWait $ mode) )
 
 
 objectidentifier INSTANCE_CONFIG SHUTTLE_BASE:5

diff --git a/SHUTTLE/schema_prod/Global.ldif b/SHUTTLE/schema_prod/Global.ldif
index 52196b0f783ff03b3e4435fbaeeef8a019be95aa..095c5db09e7c145e528c881fc64f2ada52830182 100644 (file)
--- a/SHUTTLE/schema_prod/Global.ldif
+++ b/SHUTTLE/schema_prod/Global.ldif
@@ -16,4 +16,6 @@ ppMaxMem: 2097152
 ppMaxRetries: 2
 monitorHost: aliendb1.cern.ch
 monitorTable: SHUTTLE_PROD
+triggerWait: 3600
+mode: prod