Merge branch 'master' into parameter_improvment

fact-project · May 17, 2018 · 8658e57 · 8658e57
2 parents ce6c178 + 5d577e4
commit 8658e57
Show file tree

Hide file tree

Showing 21 changed files with 541 additions and 457 deletions.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,80 @@
+# Kai Brügge
+Kai Brügge <[email protected]> Kai <[email protected]>
+Kai Brügge <[email protected]> Kai B <[email protected]>
+Kai Brügge <[email protected]> Kai Bruegge <[email protected]>
+Kai Brügge <[email protected]> Kai Bruegge <[email protected]>
+Kai Brügge <[email protected]> Kai Brügge <[email protected]>
+Kai Brügge <[email protected]> Kai Brügge <[email protected]>
+Kai Brügge <[email protected]> Kai MacGyver <[email protected]>
+Kai Brügge <[email protected]> MacKaiver <[email protected]>
+Kai Brügge <[email protected]> kai <bruegge@kieker>
+Kai Brügge <[email protected]> kai <[email protected]>
+Kai Brügge <[email protected]> kai <[email protected]>
+Kai Brügge <[email protected]> kai <[email protected]>
+Kai Brügge <[email protected]> kai <[email protected]>
+Kai Brügge <[email protected]> mackaiver <[email protected]>
+Kai Brügge <[email protected]> mackaiver <[email protected]>
+Kai Brügge <[email protected]> kai <[email protected]>
+
+# Maximilian Nöthe
+Maximilian Nöthe <[email protected]> Maximilian Noethe <[email protected]>
+Maximilian Nöthe <[email protected]> Maximilian Nöthe <[email protected]>
+
+# Jens Buß
+Jens Buß <[email protected]> jebuss <[email protected]>
+Jens Buß <[email protected]> Jens Buss <[email protected]>
+Jens Buß <[email protected]> jens buß <[email protected]>
+Jens Buß <[email protected]> jens buß <[email protected]>
+Jens Buß <[email protected]> jebuss <[email protected]>
+Jens Buß <[email protected]> Jens Buss <[email protected]>
+Jens Buß <[email protected]> Jens Buss <[email protected]>
+Jens Buß <[email protected]> jbuss <[email protected]>
+
+
+# Michael Bulinski
+Michael Bulinski <[email protected]> fact_opr <[email protected]>
+Michael Bulinski <[email protected]> fact_opr <[email protected]>
+
+# Dominik Baack
+Dominik Baack <[email protected]> Dominik Baack <[email protected]>
+Dominik Baack <[email protected]> Matyro <[email protected]>
+Dominik Baack <[email protected]> Dominik <[email protected]>
+Dominik Baack <[email protected]> Dominik <[email protected]>
+Dominik Baack <[email protected]> Dominik B <[email protected]>
+
+# Dominik Neise
+Dominik Neise <[email protected]> Dominik Neise <dneise@hasseroeder.(none)>
+Dominik Neise <[email protected]> Dominik Neise <[email protected]>
+
+# Maximilian Nöthe
+Maximilian Nöthe <[email protected]> Maximilian Noethe <[email protected]>
+Maximilian Nöthe <[email protected]> Maximilian Noethe <[email protected]>
+
+# Max Ludwig Ahnen
+Max L. Ahnen <[email protected]> Max <max@max-UX32VD.(none)>
+Max L. Ahnen <[email protected]> Max Ahnen <[email protected]>
+Max L. Ahnen <[email protected]> mahnen <[email protected]>
+Max L. Ahnen <[email protected]> mknoetig <[email protected]>
+
+# Sebastian Achim Mueller
+Sebastian A. Mueller <[email protected]> sebastian <[email protected]>
+
+# Fabian Temme
+Fabian Temme <[email protected]> ftemme <[email protected]>
+
+# Kai Schenetten
+Kai Schenetten <[email protected]> kschennetten <[email protected]>
+
+# Lena Linhoff
+Lena Linhoff <[email protected]> Lena <[email protected]>
+Lena Linhoff <[email protected]> Lena Linhoff <[email protected]>
+Lena Linhoff <[email protected]> Lena Linhoff <[email protected]>
+Lena Linhoff <[email protected]> lena <[email protected]>
+Lena Linhoff <[email protected]> lena-lin <[email protected]>
+
+# Alexey Egoroov
+Alexey Egorov <[email protected]> Alexey Egorov <[email protected]>
+Alexey Egorov <[email protected]> Alexey <[email protected]>
+
+# Christian Bockermann
+Christian Bockermann <[email protected]> Christian Bockermann <[email protected]>
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,6 +1,6 @@
 {
-    "description": "The FACT-Tools are an extension of the streams framework to analyse the data of the First G-APD Cherenkov Telescope", 
-    "license": "lgpl-3.0", 
+    "description": "The FACT-Tools are an extension of the streams framework to analyse the data of the First G-APD Cherenkov Telescope",
+    "license": "lgpl-3.0",
     "keywords": [
         "gamma-ray astronomy",
         "streams",
@@ -11,57 +11,73 @@
     "upload_type": "software",
     "creators": [
         {
-            "affiliation": "TU Dortmund", 
-            "name": "Maximilian N\u00f6the"
-        }, 
+            "affiliation": "TU Dortmund",
+            "name": "Kai Br\u00fcgge"
+        },
         {
-            "affiliation": "TU Dortmund", 
-            "name": "Jens Buss"
-        }, 
+            "affiliation": "TU Dortmund",
+            "name": "Maximilian N\u00f6the"
+        },
         {
-            "affiliation": "TU Dortmund", 
-            "name": "Kai Br\u00fcgge"
-        }, 
+            "affiliation": "TU Dortmund",
+            "name": "Jens Bu\u00df"
+        },
         {
-            "affiliation": "TU Dortmund", 
+            "affiliation": "TU Dortmund",
             "name": "T. Fabian Temme"
-        }, 
+        },
+        {
+            "affiliation": "TU Dortmund",
+            "name": "Michael Bulinski"
+        },
         {
-            "affiliation": "ETH Zurich", 
+            "affiliation": "ETH Zurich",
             "name": "Sebastian A. Mueller"
-        }, 
+        },
         {
-            "affiliation": "TU Dortmund", 
+            "affiliation": "TU Dortmund",
             "name": "Christian Bockermann"
-        }, 
+        },
         {
-            "affiliation": "TU Dortmund", 
+            "affiliation": "TU Dortmund",
             "name": "Lena Linhoff"
-        }, 
+        },
+        {
+            "affiliation": "TU Dortmund",
+            "name": "Jan Freiwald"
+        },
         {
-            "affiliation": "ETH Zurich", 
+            "affiliation": "ETH Zurich",
             "name": "Dominik Neise"
-        }, 
+        },
         {
-            "affiliation": "TU Dortmund", 
+            "affiliation": "TU Dortmund",
             "name": "Dominik Baack"
-        }, 
+        },
         {
-            "affiliation": "TU Dortmund", 
+            "affiliation": "TU Dortmund",
             "name": "Hendrik Hildebrandt"
-        }, 
+        },
         {
-            "affiliation": "ETH Zurich", 
-            "name": "Max Ahnen"
-        }, 
+            "affiliation": "TU Dortmund",
+            "name": "Katie Gray"
+        },
         {
-            "affiliation": "TU Dortmund", 
-            "name": "Niklas Wulf"
-        }, 
+            "affiliation": "ETH Zurich",
+            "name": "Max L. Ahnen"
+        },
         {
-            "affiliation": "TU Dortmund", 
+            "affiliation": "TU Dortmund",
             "name": "Alexey Egorov"
+        },
+        {
+            "affiliation": "TU Dortmund",
+            "name": "Kai Schenetten"
+        },
+        {
+            "affiliation": "TU Dortmund",
+            "name": "Niklas Wulf"
         }
-    ], 
+    ],
     "access_right": "open"
 }
diff --git a/AUTHORS.md b/AUTHORS.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog for the fact-tools
 
+# Version 1.0.2 -- 03.05.2018
+
+* Fix exit code being 0 even if an error occured by updating to streams 1.0.5
+* `InterpolatePixelArray` now also interpolates pixels containing `NaN` / `Infinity` values
+* Bug fix for `Writer.testKeys`, that resultet in a wrong error message
+* Implement skipping rows in the `HDUReader`
+* Update all author metadata
+
 # Version 1.0.1 -- 16.03.2018
 
 * Add doi via zenodo

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-SNAPSHOT</version>
+  <version>1.0.3-SNAPSHOT</version>
   <url>http://sfb876.de/fact-tools/</url>
 
   <description>
@@ -15,7 +15,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <streams.scope>compile</streams.scope>
-    <streams.version>1.0.0</streams.version>
+    <streams.version>1.0.5</streams.version>
     <binary.name>fact-tools-${git.commit.id.describe}</binary.name>
     <skipTests>false</skipTests>
     <finalName>fact-tools-${git.commit.id.describe}</finalName>
@@ -29,6 +29,48 @@
   </licenses>
 
   <developers>
+    <developer>
+      <name>Kai Brügge</name>
+      <email>[email protected]</email>
+      <organization>Physik E5b, TU-Dortmund</organization>
+      <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>Maximilian Nöthe</name>
+      <email>[email protected]</email>
+      <organization>Physik E5b, TU Dortmund</organization>
+      <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>Jens Buß</name>
+      <email>[email protected]</email>
+      <organization>Physik E5b, TU-Dortmund</organization>
+      <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>Fabian Temme</name>
+      <email>[email protected]</email>
+      <organization>Physik E5b, TU Dortmund</organization>
+      <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>Michael Bulinski</name>
+      <email>[email protected]</email>
+      <organization>Physik E5b, TU Dortmund</organization>
+      <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>Sebastian A. Mueller</name>
+      <email>[email protected]</email>
+      <organization>Departement of physics, ETH Zurich</organization>
+      <organizationUrl>http://www.ipp.phys.ethz.ch/</organizationUrl>
+      <timezone>+1</timezone>
+    </developer>
     <developer>
       <name>Christian Bockermann</name>
       <email>[email protected]</email>
@@ -37,16 +79,16 @@
       <timezone>+1</timezone>
     </developer>
     <developer>
-      <name>Kai Brügge</name>
-      <email>kai.bruegge@tu-dortmund.de</email>
-      <organization>Physik E5b, TU-Dortmund</organization>
+      <name>Lena Linhoff</name>
+      <email>lena.linhoff@tu-dortmund.de</email>
+      <organization>Physik E5b, TU Dortmund</organization>
       <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
       <timezone>+1</timezone>
     </developer>
     <developer>
-      <name>Jens Buss</name>
-      <email>jens.buss@tu-dortmund.de</email>
-      <organization>Physik E5b, TU-Dortmund</organization>
+      <name>Jan Freiwald</name>
+      <email>jan.freiwald@tu-dortmund.de</email>
+      <organization>Physik E5b, TU Dortmund</organization>
       <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
       <timezone>+1</timezone>
     </developer>
@@ -58,26 +100,54 @@
       <timezone>+1</timezone>
     </developer>
     <developer>
-      <name>Sebastian Müller</name>
-      <email>[email protected]</email>
-      <organization>Departement of physics, ETH Zurich</organization>
-      <organizationUrl>http://www.ipp.phys.ethz.ch/</organizationUrl>
+      <name>Dominik Baack</name>
+      <email>[email protected]</email>
+      <organization>Physik E5b, TU Dortmund</organization>
+      <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
       <timezone>+1</timezone>
     </developer>
     <developer>
-      <name>Fabian Temme</name>
-      <email>fabian.temme@tu-dortmund.de</email>
+      <name>Hendrik Hildebrandt</name>
+      <email>hendrik.hildebrandt@tu-dortmund.de</email>
       <organization>Physik E5b, TU Dortmund</organization>
       <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
       <timezone>+1</timezone>
     </developer>
     <developer>
-      <name>Maximilian Nöthe</name>
-      <email>[email protected]</email>
+      <name>Katie Gray</name>
+      <email>[email protected]</email>
       <organization>Physik E5b, TU Dortmund</organization>
       <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
       <timezone>+1</timezone>
     </developer>
+    <developer>
+      <name>Max L. Ahnen</name>
+      <email>[email protected]</email>
+      <timezone>+1</timezone>
+      <organization>Departement of physics, ETH Zurich</organization>
+      <organizationUrl>http://www.ipp.phys.ethz.ch/</organizationUrl>
+    </developer>
+    <developer>
+      <name>Alexey Egorov</name>
+      <email>[email protected]</email>
+      <organization>Informatik LS8, TU-Dortmund</organization>
+      <organizationUrl>http://www-ai.cs.uni-dortmund.de</organizationUrl>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>Kai Schenetten</name>
+      <email>[email protected]</email>
+      <organization>Physik E5b, TU Dortmund</organization>
+      <organizationUrl>http://app.tu-dortmund.de</organizationUrl>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>Niklas Wulf</name>
+      <email>[email protected]</email>
+      <organization>Informatik LS8, TU-Dortmund</organization>
+      <organizationUrl>http://www-ai.cs.uni-dortmund.de</organizationUrl>
+      <timezone>+1</timezone>
+    </developer>
   </developers>
 
   <scm>