Merge pull request #358 from fact-project/fix_353

Use AuxFileService in examples/forErna/std_analysis_erna_observations.xml
fact-project · May 9, 2018 · 5d577e4 · 5d577e4
2 parents ed0251c + 1c28b05
commit 5d577e4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 370 deletions.
diff --git a/examples/forErna/std_analysis_erna_observations.xml b/examples/forErna/std_analysis_erna_observations.xml
@@ -5,11 +5,11 @@
   -->
   <properties url="classpath:/default/settings.properties" />
 
-  <property name="aux_source" value="file:./2015.sqlite" />
+  <property name="aux_source" value="file:src/main/resources/aux/" />
 
   <property name="pixelDelayFile" value="classpath:/default/delays_lightpulser_20150217.csv" />
 
-  <service id="auxService" class="fact.auxservice.SqliteService" url="${aux_source}" />
+  <service id="auxService" class="fact.auxservice.AuxFileService" auxFolder="${aux_source}" />
   <service id="calibService" class="fact.calibrationservice.ConstantCalibService" />
   <service id="gainService" class="fact.gainservice.GainService" />
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>de.sfb876</groupId>
   <artifactId>fact-tools</artifactId>
   <name>fact-tools</name>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <url>http://sfb876.de/fact-tools/</url>
 
   <description>

diff --git a/src/main/java/fact/auxservice/SqliteService.java b/src/main/java/fact/auxservice/SqliteService.java
diff --git a/src/test/java/fact/services/SqliteTest.java b/src/test/java/fact/services/SqliteTest.java