Commit bb18e08b authored by Alejandro De Maria Antolinos's avatar Alejandro De Maria Antolinos

Merge branch 'issue_28' into 'master'

Issue 28

Closes #28

See merge request !23
parents 6c9c300a 253cd7de
#---------------------------------------------------------
# SERVER MetaExperiment/ID00, MetaExperiment device declaration
#---------------------------------------------------------
MetaExperiment/ID00/DEVICE/MetaExperiment: "id00/meta_exp/id00"
# --- idxx/meta_exp/member_name properties
id00/meta_exp/id00->beamlineID: id00
#---------------------------------------------------------
# CLASS MetaExperiment properties
#---------------------------------------------------------
CLASS/MetaExperiment->queueName: "/queue/icatIngest"
CLASS/MetaExperiment->queueURLs: bcu-mq-01.esrf.fr:61613,\
bcu-mq-02.esrf.fr:61613
#---------------------------------------------------------
# SERVER MetadataManager/ID00, MetadataManager device declaration
#---------------------------------------------------------
MetadataManager/ID00/DEVICE/MetadataManager: "id00/meta_ing/id00"
# --- id00/meta_ing/id00 properties
id00/meta_ing/id00->beamlineID: id00
id00/meta_ing/id00->metaExperimentDevice: "id00/meta_exp/id00"
id00/meta_ing/id00->parameters: "InstrumentSource_mode = acs:10000/fe/master/idxx/SR_Filling_Mode",\
"InstrumentSource_current = acs:10000/fe/master/idxx/SR_Current",\
definition,\
Sample_description,\
Sample_name
#---------------------------------------------------------
# CLASS MetadataManager properties
#---------------------------------------------------------
CLASS/MetadataManager->API_KEY: elogbook-be70ac55-fd08-4840-9b29-b73262958ca8
CLASS/MetadataManager->authenticationPlugin: "db"
CLASS/MetadataManager->icatplus_server: "https://icatplus.esrf.fr"
CLASS/MetadataManager->password: "reader"
CLASS/MetadataManager->port: "443"
CLASS/MetadataManager->queueName: "/queue/icatIngest"
CLASS/MetadataManager->queueURLs: bcu-mq-01.esrf.fr:61613,\
bcu-mq-02.esrf.fr:61613
CLASS/MetadataManager->server: "icat.esrf.fr"
CLASS/MetadataManager->username: "reader"
......@@ -953,6 +953,9 @@ class MetadataManager (tango.LatestDeviceImpl):
#----- PROTECTED REGION END -----# // MetadataManager.programmer_methods
def SetDatasetFiles(self, attr):
self.attr_datafileList_read = attr
class MetadataManagerClass(tango.DeviceClass):
#--------- Add you global class variables here --------------------------
#----- PROTECTED REGION ID(MetadataManager.global_class_variables) ENABLED START -----#
......@@ -1059,6 +1062,9 @@ class MetadataManagerClass(tango.DeviceClass):
# Command definitions
cmd_list = {
'SetDatasetFiles':
[[tango.DevVarStringArray, "none"],
[tango.DevVoid, "none"]],
'IngestTomodbXML':
[[tango.DevString, "Absolute path to the tomodb XML file"],
[tango.DevVoid, "none"]],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment