From 0d29852eca2c42af1704b82e016445576c650f29 Mon Sep 17 00:00:00 2001
From: Andreas Mussgiller <andreas@mussgiller.de>
Date: Wed, 9 Aug 2017 15:38:42 +0200
Subject: [PATCH 01/11] new and improved analysis code

---
 pumpstation/analysis/Analyser.cc            | 110 ++++++++++++++++++--
 pumpstation/analysis/Analyser.h             |  30 ++++++
 pumpstation/analysis/PumpStationAnalysis.cc |   8 +-
 3 files changed, 136 insertions(+), 12 deletions(-)

diff --git a/pumpstation/analysis/Analyser.cc b/pumpstation/analysis/Analyser.cc
index 9058becde..8f1c7d561 100644
--- a/pumpstation/analysis/Analyser.cc
+++ b/pumpstation/analysis/Analyser.cc
@@ -15,11 +15,40 @@
 #include <QtCore>
 #include <QXmlStreamWriter>
 #include <QFile>
+#include <QDirIterator>
 
 #include <TDatime.h>
 
 #include "Analyser.h"
 
+DataFileDate::DataFileDate()
+ : date_(QDate()),
+	 n_(0)
+{
+
+}
+
+DataFileDate::DataFileDate(const DataFileDate& other)
+ : date_(other.getDate().year(), other.getDate().month(), other.getDate().day()),
+	 n_(other.getNumber())
+{
+
+}
+
+DataFileDate::DataFileDate(const QDate& date, int n)
+ : date_(date),
+	 n_(n)
+{
+
+}
+
+DataFileDate::DataFileDate(int y, int m, int d, int n)
+ : date_(y, m, d),
+	 n_(n)
+{
+
+}
+
 Analyser::Analyser(QStringList& arguments)
  : arguments_(arguments),
    measurementValid_(false)
@@ -31,17 +60,77 @@ Analyser::Analyser(QStringList& arguments)
 
 void Analyser::analyse()
 {
-	if (arguments_.size()<2) {
-		std::cout << "usage: PumpStationAnalysis <output file> <input file 1> <input file 2> ..." << std::endl;
+	bool hasStartDate = false;
+	QDate startDate;
+	if (arguments_.size()>=3) {
+		QStringList list = arguments_[2].split('-', QString::SkipEmptyParts);
+		if (list.size()!=3) {
+			std::cout << "cannot parse start date " << arguments_[2].toStdString() << std::endl;
+			QCoreApplication::quit();
+			return;
+		}
 
-	  QCoreApplication::quit();
+		int y = list[0].toInt();
+		int m = list[1].toInt();
+		int d = list[2].toInt();
 
-	  return;
+		startDate = QDate(y, m, d);
+
+		hasStartDate = true;
 	}
 
-  QStringList::const_iterator constIterator = arguments_.constBegin();
+	bool hasEndDate = false;
+	QDate endDate;
+	if (arguments_.size()==4) {
+		QStringList list = arguments_[3].split('-', QString::SkipEmptyParts);
+		if (list.size()!=3) {
+			std::cout << "cannot parse end date " << arguments_[3].toStdString() << std::endl;
+			QCoreApplication::quit();
+			return;
+		}
+
+		int y = list[0].toInt();
+		int m = list[1].toInt();
+		int d = list[2].toInt();
+
+		endDate = QDate(y, m, d);
+
+		hasEndDate = true;
+	}
+
+	QDirIterator it(arguments_[1], QDirIterator::NoIteratorFlags);
+	while (it.hasNext()) {
+		QString filename = it.next();
+
+		if (!filename.endsWith(".xml")) continue;
+		if (!filename.contains("pumpstation_")) continue;
+
+		QString dateStamp = filename;
+
+		dateStamp.remove(".xml");
+		dateStamp.remove(0, dateStamp.indexOf("pumpstation_"));
+		dateStamp.remove("pumpstation_");
+
+		dateStamp.insert(6, "_");
+		dateStamp.insert(4, "_");
+
+		QStringList list = dateStamp.split('_', QString::SkipEmptyParts);
+		if (list.size()!=4) continue;
+
+		int y = list[0].toInt();
+		int m = list[1].toInt();
+		int d = list[2].toInt();
+		int n = list[3].toInt();
+
+		QDate date(y, m, d);
+
+		if (hasStartDate && date<startDate) continue;
+		if (hasEndDate && date>endDate) continue;
+
+		fileMap_[DataFileDate(date, n)] = filename;
+	}
 
-  QString filename = *constIterator;
+  QString filename = arguments_[0];
   if (!filename.endsWith(".root")) filename += ".root";
   std::string rootname = filename.toStdString();
 
@@ -74,11 +163,10 @@ void Analyser::analyse()
   	otree_->Branch(dummy1, &measurement_.pressure[i], dummy2);
   }
 
-  ++constIterator;
-  for (;
-  		 constIterator != arguments_.constEnd();
-  		 ++constIterator) {
-      processFile(*constIterator);
+  for (std::map<DataFileDate, QString>::iterator it = fileMap_.begin();
+  		 it!=fileMap_.end();
+  		 ++it) {
+      processFile(it->second);
   }
 
   ofile_->Write();
diff --git a/pumpstation/analysis/Analyser.h b/pumpstation/analysis/Analyser.h
index 090d7c152..8d9b5eede 100644
--- a/pumpstation/analysis/Analyser.h
+++ b/pumpstation/analysis/Analyser.h
@@ -14,10 +14,14 @@
 #define ANALYSER_H
 
 #include <array>
+#include <map>
+#include <string>
 
 #include <QDateTime>
 #include <QStringList>
 #include <QObject>
+#include <QMap>
+#include <QDir>
 
 #include <TFile.h>
 #include <TTree.h>
@@ -31,6 +35,29 @@ typedef struct {
 	double         pressure[3];
 } Measurement_t;
 
+class DataFileDate
+{
+public:
+
+	DataFileDate();
+	DataFileDate(const DataFileDate& other);
+	DataFileDate(const QDate& date, int n);
+	DataFileDate(int y, int m, int d, int n);
+
+	const QDate& getDate() const { return date_; }
+	int getNumber() const { return n_; }
+
+	bool operator<(const DataFileDate& other) const {
+		if (date_==other.date_) return (n_<other.n_);
+		return date_<other.date_;
+	}
+
+protected:
+
+	QDate date_;
+	int n_;
+};
+
 class Analyser : public QObject
 {
   Q_OBJECT
@@ -50,6 +77,9 @@ public slots:
 
   QStringList arguments_;
 
+  QDir dataDirectory_;
+  std::map<DataFileDate, QString> fileMap_;
+
   QDateTime utime_;
   bool dataValid_;
   std::array<bool,5> switchState_;
diff --git a/pumpstation/analysis/PumpStationAnalysis.cc b/pumpstation/analysis/PumpStationAnalysis.cc
index f9466bc7b..539953e97 100644
--- a/pumpstation/analysis/PumpStationAnalysis.cc
+++ b/pumpstation/analysis/PumpStationAnalysis.cc
@@ -25,7 +25,13 @@
 
 int main(int argc, char *argv[])
 {
-  QCoreApplication app(argc, argv);
+	if (argc<3 || argc>5) {
+		std::cout << "usage:" << std::endl;
+		std::cout << argv[0] << " Output Directory [Start Date YYYY-MM-DD] [End Date YYYY-MM-DD]" << std::endl;
+		exit(0);
+	}
+
+	QCoreApplication app(argc, argv);
 
   QStringList arguments = QCoreApplication::arguments();
   arguments.removeAt(0);

From 58cf615d2ef6a9eb30667d8359ca0e1bd94d239c Mon Sep 17 00:00:00 2001
From: Andreas Mussgiller <andreas@mussgiller.de>
Date: Tue, 22 May 2018 10:34:37 +0200
Subject: [PATCH 02/11] added tools for analysis of pump station data

---
 .pydevproject            |  4 +--
 licence.h                | 12 +++++++
 pumpstation/tools/plot.C | 73 ++++++++++++++++++++++++++++++++++++++++
 pumpstation/tools/test.C | 72 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 159 insertions(+), 2 deletions(-)
 create mode 100644 licence.h
 create mode 100644 pumpstation/tools/plot.C
 create mode 100644 pumpstation/tools/test.C

diff --git a/.pydevproject b/.pydevproject
index 40e9f40a0..7624e7089 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python 3.6.2</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.6</pydev_property>
 </pydev_project>
diff --git a/licence.h b/licence.h
new file mode 100644
index 000000000..19d643b6b
--- /dev/null
+++ b/licence.h
@@ -0,0 +1,12 @@
+/////////////////////////////////////////////////////////////////////////////////
+//                                                                             //
+//               Copyright (C) 2011-2017 - The DESY CMS Group                  //
+//                           All rights reserved                               //
+//                                                                             //
+//      The CMStkModLab source code is licensed under the GNU GPL v3.0.        //
+//      You have the right to modify and/or redistribute this source code      //      
+//      under the terms specified in the license, which may be found online    //
+//      at http://www.gnu.org/licenses or at License.txt.                      //
+//                                                                             //
+/////////////////////////////////////////////////////////////////////////////////
+
diff --git a/pumpstation/tools/plot.C b/pumpstation/tools/plot.C
new file mode 100644
index 000000000..7b1e79636
--- /dev/null
+++ b/pumpstation/tools/plot.C
@@ -0,0 +1,73 @@
+/////////////////////////////////////////////////////////////////////////////////
+//                                                                             //
+//               Copyright (C) 2011-2017 - The DESY CMS Group                  //
+//                           All rights reserved                               //
+//                                                                             //
+//      The CMStkModLab source code is licensed under the GNU GPL v3.0.        //
+//      You have the right to modify and/or redistribute this source code      //
+//      under the terms specified in the license, which may be found online    //
+//      at http://www.gnu.org/licenses or at License.txt.                      //
+//                                                                             //
+/////////////////////////////////////////////////////////////////////////////////
+
+void plot(const char * filename)
+{
+	gROOT->Reset();
+
+	TFile *file = (TFile*)gROOT->GetListOfFiles()->FindObject(filename);
+	if (!file) {
+		file = new TFile(filename);
+	}
+
+	TTree *tree;
+	file->GetObject("pumpstation", tree);
+
+	tree->Print();
+
+	UInt_t          uTimeOffset;
+	UInt_t          uTime;
+	Int_t           switchState0;
+	Int_t           switchState1;
+	Int_t           switchState2;
+	Int_t           switchState3;
+	Int_t           switchState4;
+	Int_t           gaugeState0;
+	Double_t        pressure0;
+	Int_t           gaugeState1;
+	Double_t        pressure1;
+	Int_t           gaugeState2;
+	Double_t        pressure2;
+
+	// Set branch addresses.
+	tree->SetBranchAddress("uTime",&uTime);
+	tree->SetBranchAddress("switchState0",&switchState0);
+	tree->SetBranchAddress("switchState1",&switchState1);
+	tree->SetBranchAddress("switchState2",&switchState2);
+	tree->SetBranchAddress("switchState3",&switchState3);
+	tree->SetBranchAddress("switchState4",&switchState4);
+	tree->SetBranchAddress("gaugeState0",&gaugeState0);
+	tree->SetBranchAddress("pressure0",&pressure0);
+	tree->SetBranchAddress("gaugeState1",&gaugeState1);
+	tree->SetBranchAddress("pressure1",&pressure1);
+	tree->SetBranchAddress("gaugeState2",&gaugeState2);
+	tree->SetBranchAddress("pressure2",&pressure2);
+
+	Long64_t nentries = tree->GetEntries();
+
+	tree->GetEntry(0);
+	uTimeOffset = uTime;
+
+	TGraph * grPressure0 = new TGraph();
+	int nPoints = 0;
+
+	Long64_t nbytes = 0;
+	for (Long64_t i=0; i<nentries;i++) {
+		nbytes += tree->GetEntry(i);
+
+		grPressure0->SetPoint(nPoints, uTime - uTimeOffset, pressure0);
+
+		nPoints++;
+	}
+
+	grPressure0->Draw("AL");
+}
diff --git a/pumpstation/tools/test.C b/pumpstation/tools/test.C
new file mode 100644
index 000000000..716130989
--- /dev/null
+++ b/pumpstation/tools/test.C
@@ -0,0 +1,72 @@
+/////////////////////////////////////////////////////////////////////////////////
+//                                                                             //
+//               Copyright (C) 2011-2017 - The DESY CMS Group                  //
+//                           All rights reserved                               //
+//                                                                             //
+//      The CMStkModLab source code is licensed under the GNU GPL v3.0.        //
+//      You have the right to modify and/or redistribute this source code      //
+//      under the terms specified in the license, which may be found online    //
+//      at http://www.gnu.org/licenses or at License.txt.                      //
+//                                                                             //
+/////////////////////////////////////////////////////////////////////////////////
+
+{
+//////////////////////////////////////////////////////////
+//   This file has been automatically generated 
+//     (Mon Jul 17 14:57:51 2017 by ROOT version6.10/02)
+//   from TTree pumpstation/pumpstation
+//   found on file: ../SavingValve_1.0.root
+//////////////////////////////////////////////////////////
+
+
+//Reset ROOT and connect tree file
+   gROOT->Reset();
+   TFile *f = (TFile*)gROOT->GetListOfFiles()->FindObject("../SavingValve_1.0.root");
+   if (!f) {
+      f = new TFile("../SavingValve_1.0.root");
+   }
+    f->GetObject("pumpstation",tree);
+
+//Declaration of leaves types
+   UInt_t          uTime;
+   UInt_t          fDatime;
+   Int_t           switchState0;
+   Int_t           switchState1;
+   Int_t           switchState2;
+   Int_t           switchState3;
+   Int_t           switchState4;
+   Int_t           gaugeState0;
+   Double_t        pressure0;
+   Int_t           gaugeState1;
+   Double_t        pressure1;
+   Int_t           gaugeState2;
+   Double_t        pressure2;
+
+   // Set branch addresses.
+   pumpstation->SetBranchAddress("uTime",&uTime);
+   pumpstation->SetBranchAddress("datime",&datime);
+   pumpstation->SetBranchAddress("fDatime",&fDatime);
+   pumpstation->SetBranchAddress("switchState0",&switchState0);
+   pumpstation->SetBranchAddress("switchState1",&switchState1);
+   pumpstation->SetBranchAddress("switchState2",&switchState2);
+   pumpstation->SetBranchAddress("switchState3",&switchState3);
+   pumpstation->SetBranchAddress("switchState4",&switchState4);
+   pumpstation->SetBranchAddress("gaugeState0",&gaugeState0);
+   pumpstation->SetBranchAddress("pressure0",&pressure0);
+   pumpstation->SetBranchAddress("gaugeState1",&gaugeState1);
+   pumpstation->SetBranchAddress("pressure1",&pressure1);
+   pumpstation->SetBranchAddress("gaugeState2",&gaugeState2);
+   pumpstation->SetBranchAddress("pressure2",&pressure2);
+
+//     This is the loop skeleton
+//       To read only selected branches, Insert statements like:
+// pumpstation->SetBranchStatus("*",0);  // disable all branches
+// TTreePlayer->SetBranchStatus("branchname",1);  // activate branchname
+
+   Long64_t nentries = pumpstation->GetEntries();
+
+   Long64_t nbytes = 0;
+//   for (Long64_t i=0; i<nentries;i++) {
+//      nbytes += pumpstation->GetEntry(i);
+//   }
+}

From 07ae7ecb2ab3d25a28e3202362bd24c7583432c7 Mon Sep 17 00:00:00 2001
From: Andreas Mussgiller <andreas@mussgiller.de>
Date: Tue, 22 May 2018 10:51:30 +0200
Subject: [PATCH 03/11] added DAF logo to website

---
 pumpstation/website/data/DAF_Logo_color2.png | Bin 0 -> 4746 bytes
 pumpstation/website/index.php                |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 pumpstation/website/data/DAF_Logo_color2.png

diff --git a/pumpstation/website/data/DAF_Logo_color2.png b/pumpstation/website/data/DAF_Logo_color2.png
new file mode 100644
index 0000000000000000000000000000000000000000..04273e240b6e2762a93bb486047db5d2cc52ce70
GIT binary patch
literal 4746
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
YKNj$^`ZBAXssI2007*qoM6N<$f{8%Z-T(jq

literal 0
HcmV?d00001

diff --git a/pumpstation/website/index.php b/pumpstation/website/index.php
index 50d13cc35..53b5f6f66 100644
--- a/pumpstation/website/index.php
+++ b/pumpstation/website/index.php
@@ -365,6 +365,7 @@
         <div style="position:absolute;width:800px;margin-top: 460px;vertical-align:top;">
 	    <hr>        
         <img style="width:32px;" src="data/DESY-Logo.png"/>
+        <img style="width:32px;" src="data/DAF_Logo_color2.png"/>
         <img style="width:32px;" src="data/CMS-Logo.png"/>
         <span style="vertical-align:top;">
 <?php

From 572f1d815cd0ee05265dca5241235f09603e9760 Mon Sep 17 00:00:00 2001
From: Andreas Mussgiller <andreas@mussgiller.de>
Date: Tue, 22 May 2018 13:41:47 +0200
Subject: [PATCH 04/11] cosmetics

---
 pumpstation/analysis/PumpStationAnalysis.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pumpstation/analysis/PumpStationAnalysis.cc b/pumpstation/analysis/PumpStationAnalysis.cc
index 539953e97..e718c80f8 100644
--- a/pumpstation/analysis/PumpStationAnalysis.cc
+++ b/pumpstation/analysis/PumpStationAnalysis.cc
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
 {
 	if (argc<3 || argc>5) {
 		std::cout << "usage:" << std::endl;
-		std::cout << argv[0] << " Output Directory [Start Date YYYY-MM-DD] [End Date YYYY-MM-DD]" << std::endl;
+		std::cout << argv[0] << " Output-File Input-Directory [Start Date YYYY-MM-DD] [End Date YYYY-MM-DD]" << std::endl;
 		exit(0);
 	}
 

From ca8fa327d3ee4f04f6f0108ef9fbb26b3e2bcdd0 Mon Sep 17 00:00:00 2001
From: Andreas Mussgiller <andreas@mussgiller.de>
Date: Tue, 22 May 2018 15:06:53 +0200
Subject: [PATCH 05/11] fixes and cosmetics

---
 pumpstation/website/index.php       | 8 ++++----
 pumpstation/website/pumpstation.ini | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pumpstation/website/index.php b/pumpstation/website/index.php
index 53b5f6f66..ae8043f62 100644
--- a/pumpstation/website/index.php
+++ b/pumpstation/website/index.php
@@ -88,7 +88,7 @@
 if ($P1 >= 10.0) {
 	printf ( "%.0f", $P1);
 } else if ($P1 >= 0.1) {
-	printf ( "%.1f", $P1);
+	printf ( "%.2f", $P1);
 } else {
 	printf ( "%.1E", $P1);
 }
@@ -113,7 +113,7 @@
 if ($P2 >= 10.0) {
 	printf ( "%.0f", $P2);
 } else if ($P2 >= 0.1) {
-	printf ( "%.1f", $P2);
+	printf ( "%.2f", $P2);
 } else {
 	printf ( "%.1E", $P2);
 }
@@ -138,7 +138,7 @@
 if ($PSYS>= 10.0) {
 	printf ( "%.0f", $PSYS);
 } else if ($PSYS>= 0.1) {
-	printf ( "%.1f", $PSYS);
+	printf ( "%.2f", $PSYS);
 } else {
 	printf ( "%.1E", $PSYS);
 }
@@ -215,7 +215,7 @@
 // }
 if ($Valve2State== 0) {
 	echo ('<div style="position:absolute;width:68px;height:30px;margin-left:131px;margin-top:29px;background-color:#FF5555;">');
-} else if ($S1 == 1) {
+} else if ($Valve2State== 1) {
 	echo ('<div style="position:absolute;width:68px;height:30px;margin-left:131px;margin-top:29px;background-color:#55FF55;">');
 }
 echo ('<div style="font-size:16px;text-align:center;margin-top:5px;">');
diff --git a/pumpstation/website/pumpstation.ini b/pumpstation/website/pumpstation.ini
index 3a0a91113..d4e93492b 100644
--- a/pumpstation/website/pumpstation.ini
+++ b/pumpstation/website/pumpstation.ini
@@ -3,5 +3,5 @@ TimeZone = Europe/Berlin
 Pump1Switch = 0
 Pump2Switch = 1
 Valve1Switch = 2
-Valve2Switch = 4
-Valve3Switch = 3
+Valve2Switch = 3
+Valve3Switch = 4

From dcbf9fa4fd9e812b844f7b3c115a64a060c77349 Mon Sep 17 00:00:00 2001
From: Andreas Mussgiller <andreas@mussgiller.de>
Date: Tue, 22 May 2018 15:08:41 +0200
Subject: [PATCH 06/11] increased website auto-update timer to 15s

---
 pumpstation/website/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pumpstation/website/index.php b/pumpstation/website/index.php
index ae8043f62..085370c41 100644
--- a/pumpstation/website/index.php
+++ b/pumpstation/website/index.php
@@ -20,7 +20,7 @@
     <meta http-equiv="X-UA-Compatible" content="chrome=1,IE=edge" />
     <meta name="viewport" content="user-scalable=no, width=800" />
     <meta charset="utf-8" />
-    <meta http-equiv="refresh" content="5">
+    <meta http-equiv="refresh" content="15">
     <title>.: CMS Pump Station Status & Control :.</title>
     <style type="text/css">
       body {

From 8d256aab5589c50960c4eb811da75dff9f51eb49 Mon Sep 17 00:00:00 2001
From: Andreas Mussgiller <andreas@mussgiller.de>
Date: Tue, 22 May 2018 15:26:02 +0200
Subject: [PATCH 07/11] fix in auto-update on website after user interaction
 with switches

---
 pumpstation/website/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pumpstation/website/script.js b/pumpstation/website/script.js
index 5009031dd..95e1e5657 100644
--- a/pumpstation/website/script.js
+++ b/pumpstation/website/script.js
@@ -30,10 +30,10 @@ function changeSwitch(channel) {
 			//update the index pic
 			if (!(data.localeCompare("0"))) {
 				Switches[channel].src = "data/button_red.png";
-				window.location.reload(true);
+				setTimeout(function(){window.location.reload(true);}, 2000);
 			} else if (!(data.localeCompare("1"))) {
 				Switches[channel].src = "data/button_green.png";
-				window.location.reload(true);
+				setTimeout(function(){window.location.reload(true);}, 2000);
 			} else if (!(data.localeCompare("fail"))) {
 				alert ("Something went wrong!" );
 				return ("fail");

From 6eb619ef897e207fecfee7a0fffe7a7fc193a46e Mon Sep 17 00:00:00 2001
From: Andreas Mussgiller <andreas@mussgiller.de>
Date: Tue, 22 May 2018 17:43:03 +0200
Subject: [PATCH 08/11] added help text

---
 pumpstation/controller/Controller.cc         | 28 ++++++++++++++++++++
 pumpstation/controller/Controller.h          |  1 +
 pumpstation/controller/PumpStationControl.cc |  7 ++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/pumpstation/controller/Controller.cc b/pumpstation/controller/Controller.cc
index 8709f6515..27e0da3c3 100644
--- a/pumpstation/controller/Controller.cc
+++ b/pumpstation/controller/Controller.cc
@@ -108,3 +108,31 @@ void Controller::readResponse()
 
   QCoreApplication::quit();
 }
+
+void Controller::printHelp()
+{
+  std::cout <<
+      "\n  Help\n"
+      " ------\n\n"
+      " writeConfig                                      write server configuration file\n"
+      " setPumpState <pump (1/2)> <state (0/1)>          set the state of a pump\n"
+      " getPumpState <pump (1/2)>                        get the state of a pump\n"
+      " setPumpOperatingHours <pump (1/2)> <hours>       set the pump operating hours\n"
+      " getPumpOperatingHours <pump (1/2)>               get the pump operating hours\n"
+      " setValveState <valve (1-2)> <state (0/1)>        set the state of a valve\n"
+      " getValveState <valve (1-2)>                      get the state of a valve\n"
+      "\n"
+      " setSwitchState <switch (0-4)> <state (0/1)>      set the state of a switch\n"
+      " getSwitchState <switch (0-4)>                    get the state of a switch\n"
+      " setSwitchBlocked <switch (0-4)> <state (0/1)>    block or unblock a switch\n"
+      " getSwitchBlocked <switch (0-4)>                  get the block state of a switch\n"
+      " getSwitchStatus                                  get the status of all switches\n"
+      " getSwitchBlockedStatus                           get the block status of all switches\n"
+      "\n"
+      " getSensorStatus <sensor (1-3)>                   get the status of a vacuum gauge\n"
+      " getPressure <sensor (1-3)>                       get the pressure reading of a vacuum gauge\n"
+      " getVacuumStatus                                  get the vacuum status (sensor status and pressure)\n"
+        << std::endl;
+
+  QCoreApplication::quit();
+}
diff --git a/pumpstation/controller/Controller.h b/pumpstation/controller/Controller.h
index 753894c74..c533d95a7 100644
--- a/pumpstation/controller/Controller.h
+++ b/pumpstation/controller/Controller.h
@@ -27,6 +27,7 @@ class Controller : public QObject
 
 public slots:
 
+  void printHelp();
   void connectToServer();
   void sendCommand();
   void readResponse();
diff --git a/pumpstation/controller/PumpStationControl.cc b/pumpstation/controller/PumpStationControl.cc
index 4dfc0bdf4..be452d75f 100644
--- a/pumpstation/controller/PumpStationControl.cc
+++ b/pumpstation/controller/PumpStationControl.cc
@@ -43,7 +43,12 @@ int main(int argc, char *argv[])
   }
 
   Controller controller(arguments);
-  QTimer::singleShot(0, &controller, SLOT(connectToServer()));
+
+  if (arguments.contains("--help")) {
+    QTimer::singleShot(0, &controller, SLOT(printHelp()));
+  } else {
+    QTimer::singleShot(0, &controller, SLOT(connectToServer()));
+  }
 
   return app.exec();
 }

From 8dfbccf4b4a3b5580ba8886b38431c9243aad5cf Mon Sep 17 00:00:00 2001
From: Andreas Mussgiller <andreas@mussgiller.de>
Date: Wed, 18 Jul 2018 13:06:37 +0200
Subject: [PATCH 09/11] some minor fixes and cosmetics

---
 pumpstation/analysis/Analyser.cc | 360 ++++++++++++++++---------------
 1 file changed, 192 insertions(+), 168 deletions(-)

diff --git a/pumpstation/analysis/Analyser.cc b/pumpstation/analysis/Analyser.cc
index 8f1c7d561..889a03ff8 100644
--- a/pumpstation/analysis/Analyser.cc
+++ b/pumpstation/analysis/Analyser.cc
@@ -22,113 +22,127 @@
 #include "Analyser.h"
 
 DataFileDate::DataFileDate()
- : date_(QDate()),
-	 n_(0)
+: date_(QDate()),
+  n_(0)
 {
 
 }
 
 DataFileDate::DataFileDate(const DataFileDate& other)
- : date_(other.getDate().year(), other.getDate().month(), other.getDate().day()),
-	 n_(other.getNumber())
+: date_(other.getDate().year(), other.getDate().month(), other.getDate().day()),
+  n_(other.getNumber())
 {
 
 }
 
 DataFileDate::DataFileDate(const QDate& date, int n)
- : date_(date),
-	 n_(n)
+: date_(date),
+  n_(n)
 {
 
 }
 
 DataFileDate::DataFileDate(int y, int m, int d, int n)
- : date_(y, m, d),
-	 n_(n)
+: date_(y, m, d),
+  n_(n)
 {
 
 }
 
 Analyser::Analyser(QStringList& arguments)
- : arguments_(arguments),
-   measurementValid_(false)
+: arguments_(arguments),
+  measurementValid_(false)
 {
-	dataValid_ = false;
-	for (int i=0;i<5;++i) switchStateValid_[i] = false;
-	for (int i=0;i<3;++i) gaugeValid_[i] = false;
+  dataValid_ = false;
+  for (int i=0;i<5;++i) switchStateValid_[i] = false;
+  for (int i=0;i<3;++i) gaugeValid_[i] = false;
 }
 
 void Analyser::analyse()
 {
-	bool hasStartDate = false;
-	QDate startDate;
-	if (arguments_.size()>=3) {
-		QStringList list = arguments_[2].split('-', QString::SkipEmptyParts);
-		if (list.size()!=3) {
-			std::cout << "cannot parse start date " << arguments_[2].toStdString() << std::endl;
-			QCoreApplication::quit();
-			return;
-		}
-
-		int y = list[0].toInt();
-		int m = list[1].toInt();
-		int d = list[2].toInt();
+  bool hasStartDate = false;
+  QDate startDate;
+  if (arguments_.size()>=3) {
+    QStringList list = arguments_[2].split('-', QString::SkipEmptyParts);
+    if (list.size()!=3) {
+      std::cout << "cannot parse start date " << arguments_[2].toStdString() << std::endl;
+      QCoreApplication::quit();
+      return;
+    }
+
+    int y = list[0].toInt();
+
+    int m = list[1].toInt();
+    if (m>12) return;
+
+    int d = list[2].toInt();
+
+    startDate = QDate(y, m, d);
+    while (!startDate.isValid() && d>1) {
+      d--;
+      startDate = QDate(y, m, d);
+    }
+
+    hasStartDate = true;
+  }
 
-		startDate = QDate(y, m, d);
+  bool hasEndDate = false;
+  QDate endDate;
+  if (arguments_.size()==4) {
+    QStringList list = arguments_[3].split('-', QString::SkipEmptyParts);
+    if (list.size()!=3) {
+      std::cout << "cannot parse end date " << arguments_[3].toStdString() << std::endl;
+      QCoreApplication::quit();
+      return;
+    }
 
-		hasStartDate = true;
-	}
+    int y = list[0].toInt();
 
-	bool hasEndDate = false;
-	QDate endDate;
-	if (arguments_.size()==4) {
-		QStringList list = arguments_[3].split('-', QString::SkipEmptyParts);
-		if (list.size()!=3) {
-			std::cout << "cannot parse end date " << arguments_[3].toStdString() << std::endl;
-			QCoreApplication::quit();
-			return;
-		}
+    int m = list[1].toInt();
+    if (m>12) return;
 
-		int y = list[0].toInt();
-		int m = list[1].toInt();
-		int d = list[2].toInt();
+    int d = list[2].toInt();
 
-		endDate = QDate(y, m, d);
+    endDate = QDate(y, m, d);
+    while (!endDate.isValid() && d>1) {
+      d--;
+      endDate = QDate(y, m, d);
+    }
 
-		hasEndDate = true;
-	}
+    hasEndDate = true;
+  }
 
-	QDirIterator it(arguments_[1], QDirIterator::NoIteratorFlags);
-	while (it.hasNext()) {
-		QString filename = it.next();
+  QDirIterator it(arguments_[1], QDirIterator::NoIteratorFlags);
+  while (it.hasNext()) {
+    QString filename = it.next();
 
-		if (!filename.endsWith(".xml")) continue;
-		if (!filename.contains("pumpstation_")) continue;
+    if (!filename.endsWith(".xml")) continue;
+    if (!filename.contains("pumpstation_")) continue;
 
-		QString dateStamp = filename;
+    QString dateStamp = filename;
 
-		dateStamp.remove(".xml");
-		dateStamp.remove(0, dateStamp.indexOf("pumpstation_"));
-		dateStamp.remove("pumpstation_");
+    dateStamp.remove(".xml");
+    dateStamp.remove(0, dateStamp.indexOf("pumpstation_"));
+    dateStamp.remove("pumpstation_");
 
-		dateStamp.insert(6, "_");
-		dateStamp.insert(4, "_");
+    dateStamp.insert(6, "_");
+    dateStamp.insert(4, "_");
 
-		QStringList list = dateStamp.split('_', QString::SkipEmptyParts);
-		if (list.size()!=4) continue;
+    QStringList list = dateStamp.split('_', QString::SkipEmptyParts);
+    if (list.size()!=4) continue;
 
-		int y = list[0].toInt();
-		int m = list[1].toInt();
-		int d = list[2].toInt();
-		int n = list[3].toInt();
+    int y = list[0].toInt();
+    int m = list[1].toInt();
+    int d = list[2].toInt();
+    int n = list[3].toInt();
 
-		QDate date(y, m, d);
+    QDate date(y, m, d);
 
-		if (hasStartDate && date<startDate) continue;
-		if (hasEndDate && date>endDate) continue;
+    if (hasStartDate && date<startDate) continue;
+    if (hasEndDate && date>endDate) continue;
 
-		fileMap_[DataFileDate(date, n)] = filename;
-	}
+    fileMap_[DataFileDate(date, n)] = filename;
+  }
 
   QString filename = arguments_[0];
   if (!filename.endsWith(".root")) filename += ".root";
@@ -142,31 +156,31 @@ void Analyser::analyse()
   otree_->Branch("datime", &measurement_.datime, 1024, 2);
 
   for (int i=0;i<5;++i) {
-  	char dummy1[20];
-  	char dummy2[20];
+    char dummy1[20];
+    char dummy2[20];
 
-  	sprintf(dummy1, "switchState%d", i);
-  	sprintf(dummy2, "switchState%d/I", i);
-  	otree_->Branch(dummy1, &measurement_.switchState[i], dummy2);
+    sprintf(dummy1, "switchState%d", i);
+    sprintf(dummy2, "switchState%d/I", i);
+    otree_->Branch(dummy1, &measurement_.switchState[i], dummy2);
   }
 
   for (int i=0;i<3;++i) {
-  	char dummy1[20];
-  	char dummy2[20];
+    char dummy1[20];
+    char dummy2[20];
 
-  	sprintf(dummy1, "gaugeState%d", i);
-  	sprintf(dummy2, "gaugeState%d/I", i);
-  	otree_->Branch(dummy1, &measurement_.gaugeState[i], dummy2);
+    sprintf(dummy1, "gaugeState%d", i);
+    sprintf(dummy2, "gaugeState%d/I", i);
+    otree_->Branch(dummy1, &measurement_.gaugeState[i], dummy2);
 
-  	sprintf(dummy1, "pressure%d", i);
-  	sprintf(dummy2, "pressure%d/D", i);
-  	otree_->Branch(dummy1, &measurement_.pressure[i], dummy2);
+    sprintf(dummy1, "pressure%d", i);
+    sprintf(dummy2, "pressure%d/D", i);
+    otree_->Branch(dummy1, &measurement_.pressure[i], dummy2);
   }
 
   for (std::map<DataFileDate, QString>::iterator it = fileMap_.begin();
-  		 it!=fileMap_.end();
-  		 ++it) {
-      processFile(it->second);
+      it!=fileMap_.end();
+      ++it) {
+    processFile(it->second);
   }
 
   ofile_->Write();
@@ -177,97 +191,107 @@ void Analyser::analyse()
 
 void Analyser::processFile(const QString& filename)
 {
-	std::cerr << "processing file: " << filename.toLocal8Bit().constData() << std::endl;
-
-	QFile file(filename);
-	if (file.open(QFile::ReadOnly)) {
-		QXmlStreamReader reader(&file);
-
-		while (!reader.atEnd()) {
-
-			QXmlStreamReader::TokenType tokentype = reader.readNext();
-
-			if (tokentype==QXmlStreamReader::EndElement) {
-
-				if (reader.name()=="Status") {
-					if (dataValid_) dumpData();
-				}
-
-			}
-
-			if (tokentype==QXmlStreamReader::StartElement) {
-
-				QXmlStreamAttributes attributes = reader.attributes();
-
-				if (attributes.hasAttribute("time")) {
-					utime_ = QDateTime::fromString(attributes.value("time").toString(), Qt::ISODate);
-				}
-
-				if (reader.name()=="ConradSwitch") {
-
-					if (attributes.hasAttribute("id") &&
-							attributes.hasAttribute("state")) {
-						int id = attributes.value("id").toString().toInt();
-						bool state = attributes.value("state").toString().toInt();
-
-						switchState_[id] = state;
-						switchStateValid_[id] = true;
+  std::cerr << "processing file: " << filename.toLocal8Bit().constData() << std::endl;
+
+  QFile file(filename);
+  if (file.open(QFile::ReadOnly)) {
+    QXmlStreamReader reader(&file);
+
+    while (!reader.atEnd()) {
+
+      QXmlStreamReader::TokenType tokentype = reader.readNext();
+
+      if (tokentype==QXmlStreamReader::EndElement) {
+
+        if (reader.name()=="Status") {
+          if (dataValid_) {
+            dumpData();
+          }
+        }
+
+      }
+
+      if (tokentype==QXmlStreamReader::StartElement) {
+
+        QXmlStreamAttributes attributes = reader.attributes();
+
+        if (attributes.hasAttribute("time")) {
+          utime_ = QDateTime::fromString(attributes.value("time").toString(), Qt::ISODate);
+        }
+
+        if (reader.name()=="ConradSwitch") {
+
+          if (attributes.hasAttribute("id") &&
+              attributes.hasAttribute("state")) {
+            int id = attributes.value("id").toString().toInt();
+            bool state = attributes.value("state").toString().toInt();
+
+            switchState_[id] = state;
+            switchStateValid_[id] = true;
+
+            if (attributes.hasAttribute("time")) {
+              dumpData();
+            }
+          }
+        }
+
+        if (reader.name()=="LeyboldGraphixThree") {
+          if (attributes.hasAttribute("id") &&
+              attributes.hasAttribute("status") &&
+              attributes.hasAttribute("p")) {
+            int id = attributes.value("id").toString().toInt() - 1;
+            bool state = attributes.value("status").toString().toInt();
+            float p = attributes.value("p").toString().toFloat();
+
+            gaugeState_[id] = state;
+            gaugeValid_[id] = true;
+            gaugePressure_[id] = p;
+
+            if (attributes.hasAttribute("time")) {
+              dumpData();
+            }
+          }
+        }
+
+        if (dataValid_==false) {
+          bool valid = true;
+          for (int i=0;i<5;++i) {
+            valid &= switchStateValid_[i];
+            //std::cout << switchStateValid_[i] << " ";
+          }
+          for (int i=0;i<3;++i) {
+            valid &= gaugeValid_[i];
+            //std::cout << gaugeValid_[i] << " ";
+          }
+          //std::cout << std::endl;
+
+          dataValid_ = valid;
+        }
+      }
+    }
+  }
+}
 
-						if (attributes.hasAttribute("time")) dumpData();
-					}
-				}
+void Analyser::dumpData()
+{
+  // std::cout << utime_.toTime_t();
 
-				if (reader.name()=="LeyboldGraphixThree") {
-					if (attributes.hasAttribute("id") &&
-							attributes.hasAttribute("status") &&
-							attributes.hasAttribute("p")) {
-						int id = attributes.value("id").toString().toInt() - 1;
-						bool state = attributes.value("status").toString().toInt();
-						float p = attributes.value("p").toString().toFloat();
+  measurement_.uTime = utime_.toTime_t();
+  measurement_.datime = TDatime(measurement_.uTime);
 
-						gaugeState_[id] = state;
-						gaugeValid_[id] = true;
-						gaugePressure_[id] = p;
+  for (int i=0;i<5;++i) {
+    // std::cout << " " << switchState_[i];
 
-						if (attributes.hasAttribute("time")) dumpData();
-					}
-				}
+    measurement_.switchState[i] = switchState_[i];
+  }
+  for (int i=0;i<3;++i) {
+    // std::cout << " " << gaugeState_[i] << " " << std::scientific << gaugePressure_[i];
 
-				if (dataValid_==false) {
-					bool valid = true;
-					for (int i=0;i<5;++i) {
-						valid &= switchStateValid_[i];
-						//std::cout << switchStateValid_[i] << " ";
-					}
-					for (int i=0;i<3;++i) {
-						valid &= gaugeValid_[i];
-						//std::cout << gaugeValid_[i] << " ";
-					}
-					//std::cout << std::endl;
+    measurement_.gaugeState[i] = gaugeState_[i];
+    measurement_.pressure[i] = gaugePressure_[i];
+  }
 
-					dataValid_ = valid;
-				}
-			}
-		}
-	}
-}
+  // std::cout << std::endl;
 
-void Analyser::dumpData()
-{
-	std::cout << utime_.toTime_t();
-	measurement_.uTime = utime_.toTime_t();
-	measurement_.datime = TDatime(measurement_.uTime);
-
-	for (int i=0;i<5;++i) {
-		std::cout << " " << switchState_[i];
-		measurement_.switchState[i] = switchState_[i];
-	}
-	for (int i=0;i<3;++i) {
-		std::cout << " " << gaugeState_[i] << " " << std::scientific << gaugePressure_[i];
-		measurement_.gaugeState[i] = gaugeState_[i];
-		measurement_.pressure[i] = gaugePressure_[i];
-	}
-	std::cout << std::endl;
-
-	otree_->Fill();
+  otree_->Fill();
 }

From 57cf82500820491502e2ec6a8c2112992cd6dbe7 Mon Sep 17 00:00:00 2001
From: Andreas Mussgiller <andreas@mussgiller.de>
Date: Wed, 18 Jul 2018 13:15:35 +0200
Subject: [PATCH 10/11] fixed help text output

---
 pumpstation/controller/Controller.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pumpstation/controller/Controller.cc b/pumpstation/controller/Controller.cc
index 27e0da3c3..5ec114337 100644
--- a/pumpstation/controller/Controller.cc
+++ b/pumpstation/controller/Controller.cc
@@ -118,7 +118,7 @@ void Controller::printHelp()
       " setPumpState <pump (1/2)> <state (0/1)>          set the state of a pump\n"
       " getPumpState <pump (1/2)>                        get the state of a pump\n"
       " setPumpOperatingHours <pump (1/2)> <hours>       set the pump operating hours\n"
-      " getPumpOperatingHours <pump (1/2)>               get the pump operating hours\n"
+      " getPumpOperatingHours                            get the pump operating hours\n"
       " setValveState <valve (1-2)> <state (0/1)>        set the state of a valve\n"
       " getValveState <valve (1-2)>                      get the state of a valve\n"
       "\n"

From 7d87cbb264af04caccd64afaa243b0d82c8abd3b Mon Sep 17 00:00:00 2001
From: Negusbuk <andreas@mussgiller.de>
Date: Wed, 18 Jul 2018 13:15:56 +0200
Subject: [PATCH 11/11] added controller subdir to install directories

---
 pumpstation/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pumpstation/Makefile.in b/pumpstation/Makefile.in
index e92a64fff..bd2adb610 100644
--- a/pumpstation/Makefile.in
+++ b/pumpstation/Makefile.in
@@ -6,7 +6,7 @@ NOPUMPSTATION = @nopumpstation@
 USEFAKEDEVICES= @usefakedevices@
 
 subdirs	      = daemon controller app analysis
-installsubdirs = daemon website analysis
+installsubdirs = daemon controller website analysis
 
 all:
 	@for dir in $(subdirs); do (cd $$dir; make); done