Updated ldap configuration files for TOF and schema

diff --git a/SHUTTLE/schema/shuttle.schema b/SHUTTLE/schema/shuttle.schema
index d63bd1c7a072db1cab0c71f84b92db438adac5e3..bec4bf8b0a1de2b9e5dc7f87ba91c834f7e6f4b9 100644 (file)
--- a/SHUTTLE/schema/shuttle.schema
+++ b/SHUTTLE/schema/shuttle.schema
@@ -75,12 +75,14 @@ attributetype ( GLOBAL_CONFIG:17 NAME 'amandaAdmin'    DESC 'Amanda admin(s) ema
 attributetype ( GLOBAL_CONFIG:18 NAME 'sendMail'       DESC 'Send email flag (1/0)'  EQUALITY integerMatch       SUP uidNumber SINGLE-VALUE )
 attributetype ( GLOBAL_CONFIG:19 NAME 'keepDCSMap'     DESC 'keep DCS map flag (1/0)'  EQUALITY integerMatch       SUP uidNumber SINGLE-VALUE )
 attributetype ( GLOBAL_CONFIG:20 NAME 'keepTempFolder'         DESC 'keep temp folder flag (1/0)'  EQUALITY integerMatch       SUP uidNumber SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:21 NAME 'dcsTimeOut'      DESC 'seconds before dcs abort'           EQUALITY integerMatch    SUP uidNumber SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:22 NAME 'nDCSretries'     DESC 'number of dcs retries before abort'      EQUALITY integerMatch    SUP uidNumber 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)
+        MUST (name $ daqLbHost $ daqLbUser $ daqLbPasswd $ daqLbDB $ daqLbTable $ shuttleLbTable $ runTypeLbTable $ ppMaxRetries $ ppTimeOut $ ppMaxMem $ dcsTimeOut $ nDCSretries $ monitorHost $ monitorTable)
         MAY ( daqLbPort $ triggerWait $ mode $ keepDCSMap $ keepTempFolder $ shuttleAdmin $ amandaAdmin $ sendMail) )
 
 

diff --git a/SHUTTLE/schema_prod/TOF.ldif b/SHUTTLE/schema_prod/TOF.ldif
index dbadc480964fb80d61d65914a06dc96d7c7d20ec..3ddc4e7ae8e9ea6bd962d753fbb9afac14c2f1a5 100644 (file)
--- a/SHUTTLE/schema_prod/TOF.ldif
+++ b/SHUTTLE/schema_prod/TOF.ldif
@@ -1,4 +1,3 @@
-# TOF Config
 dn: det=TOF,o=shuttle_prod,dc=cern,dc=ch
 objectClass: detectorConfig
 det: TOF
@@ -11,10 +10,8 @@ objectClass: dcsConfig
 dcsHost: alidcsamanda.cern.ch
 dcsPort: 1337
 multiSplit: 4000
-dcsAlias: tof_lv_i48_02
-dcsAlias: tof_lv_v48_02
-dcsAlias: tof_lv_i33_02
-dcsAlias: tof_lv_v33_02
-
-
+dcsAlias: tof_hv_vp_[00..89]
+dcsAlias: tof_hv_vn_[00..89]
+dcsAlias: tof_hv_ip_[00..89]
+dcsAlias: tof_hv_in_[00..89]