fda/ch.psi.fda.fdaq
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added filePrefix configuration to fdaq.properties

Browse Source 
Updated Readme regarding all possible properties that can be specified
in fdaq.properties.
This commit is contained in:
ebner
2013-11-08 14:28:53 +01:00
parent 2e8d11b94e
commit ec69b2fe01
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ch.psi.fdaq/Readme.md
+12
View File
@@ -5,3 +5,15 @@ server for data retrieval.
The fdaq code provides exactly 2 to functionalities, it can query on the data socket for data (specifying how many data point)
and can send a reset request on the reset channel.
# Configuration
The software is configured by a properties file that is specified via `-Dch.psi.fdaq.home=fdaq.properties` .
Following properties can be specified:
|Property | Default|
|--|--|
|ch.psi.fdaq.hostname | mchip015.psi.ch|
|port | 2233|
|killPort | 2234|
|filePrefix | ${yyyy_MM}/${yyyyMMdd}/${yyyyMMddHHmmss}_${name}/${yyyyMMddHHmm}_|
ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqConfiguration.java
+1
View File
@@ -73,6 +73,7 @@ public class FdaqConfiguration {
hostname = properties.getProperty(FdaqConfiguration.class.getPackage().getName()+".hostname", "mchip015.psi.ch");
port = Integer.parseInt(properties.getProperty(FdaqConfiguration.class.getPackage().getName()+".port", "2233"));
killPort = Integer.parseInt(properties.getProperty(FdaqConfiguration.class.getPackage().getName()+".killPort", "2234"));
filePrefix = properties.getProperty(FdaqConfiguration.class.getPackage().getName()+".filePrefix","${yyyy_MM}/${yyyyMMdd}/${yyyyMMddHHmmss}_${name}/${yyyyMMddHHmm}_");
}
dataDirectory = config+"/data";
}