diff --git a/Software/Monitoring/Monitoring.py b/Software/Monitoring/Monitoring.py index 11430a7..9189bff 100644 --- a/Software/Monitoring/Monitoring.py +++ b/Software/Monitoring/Monitoring.py @@ -45,13 +45,13 @@ header = 'Date&Time T (C) RH (%) DP (C)\n' # Maximum number of output text files. nFiles = 0 -maxNFiles = 2 +maxNFiles = 100 # Maximum size of the output text file (number of rows). Once this is reached, a new output text file will be created. nRows = 0 -maxNRows = 10 +maxNRows = 500 # Sleep time between two consecutive measurements (s). -wait = 5 +wait = 30 # Variables to be monitored. reading = [] diff --git a/Software/Monitoring/PlotTrends.C b/Software/Monitoring/PlotTrends.C index 5fa5b0c..cf29651 100644 --- a/Software/Monitoring/PlotTrends.C +++ b/Software/Monitoring/PlotTrends.C @@ -28,7 +28,7 @@ or -./PlotTrends Hans320 Thu Apr 9 16:55:00 2015 Thu Apr 9 16:55:52 2015 +./PlotTrends Hans320 "Thu Apr 9 16:55:00 2015" "Thu Apr 9 16:55:52 2015" A folder named AnalysisResults will be created in a fixed location and a ROOT file will be saved in there. A folder named Figures will be created inside the folder named AnalysisResults, with some monitoring plots. @@ -56,7 +56,34 @@ { cout << "**************************************************" << endl; - cout << "Some comments." << endl; + cout << "PlotTrends creates a ROOT file with temperature, relative humidity, and dew point trends." << endl; + + cout << "Compile with:" << endl; + + cout << "make" << endl; + + cout << "Run with:" << endl; + + cout << "./PlotTrends [sensor] [from] [to] [additional folder]" << endl; + + cout << "where" << endl; + + cout << "- [sensor] is the type of sensor (Hans410, ...);" << endl; + cout << "- [from] is the optional starting time from which one wants to display the trends, according to the 'ddd mmm d hh:mm:ss yyyy' format;" << endl; + cout << "- [to] is the optional stopping time to which one wants to display the trends, according to the 'ddd mmm d hh:mm:ss yyyy' format;" << endl; + cout << "- [additional folder] is the optional additional folder where the output will be saved." << endl; + + cout << "For example:" << endl; + + cout << "./PlotTrends Hans320" << endl; + + cout << "or" << endl; + + cout << "./PlotTrends Hans320 'Thu Apr 9 16:55:00 2015' 'Thu Apr 9 16:55:52 2015'" << endl; + + cout << "A folder named AnalysisResults will be created in a fixed location and a ROOT file will be saved in there. A folder named Figures will be created inside the folder named AnalysisResults, with some monitoring plots." << endl; + + cout << "If needed, an additional folder can be specified, that will be created inside the folder named AnalysisResults." << endl; cout << "**************************************************" << endl; @@ -346,7 +373,7 @@ gT->GetXaxis()->SetTimeFormat("#splitline{%Y-%m-%d}{%H:%M:%S}"); gT->GetXaxis()->SetNdivisions(-503); gT->GetXaxis()->SetTimeOffset(0,"gmt"); - DrawGraph(cT,gT,"APC",path_to_figures); + DrawGraph(cT,gT,"AP",path_to_figures); // Relative humidity trends. TCanvas *cRH = new TCanvas("PlotTrends-RH","",400,300); @@ -364,7 +391,7 @@ gRH->GetXaxis()->SetTimeFormat("#splitline{%Y-%m-%d}{%H:%M:%S}"); gRH->GetXaxis()->SetNdivisions(-503); gRH->GetXaxis()->SetTimeOffset(0,"gmt"); - DrawGraph(cRH,gRH,"APC",path_to_figures); + DrawGraph(cRH,gRH,"AP",path_to_figures); // Dew point trends. TCanvas *cDP = new TCanvas("PlotTrends-DP","",400,300); @@ -382,7 +409,7 @@ gDP->GetXaxis()->SetTimeFormat("#splitline{%Y-%m-%d}{%H:%M:%S}"); gDP->GetXaxis()->SetNdivisions(-503); gDP->GetXaxis()->SetTimeOffset(0,"gmt"); - DrawGraph(cDP,gDP,"APC",path_to_figures); + DrawGraph(cDP,gDP,"AP",path_to_figures); // Temperature and dew point trends. TCanvas *cTandDP = new TCanvas("PlotTrends-TandDP","",400,300); @@ -404,7 +431,7 @@ mgTandDP->Add(gDP); cTandDP->cd(); - mgTandDP->Draw("APC"); + mgTandDP->Draw("AP"); mgTandDP->GetXaxis()->SetTimeDisplay(1); mgTandDP->GetXaxis()->SetLabelOffset(0.04); @@ -414,7 +441,7 @@ mgTandDP->GetXaxis()->SetNdivisions(-503); mgTandDP->GetXaxis()->SetTimeOffset(0,"gmt"); - DrawGraphCompare(cTandDP,mgTandDP,legTandDP,"Temperature and dew point trends","Time","Temperature (#circC)","APC",path_to_figures); + DrawGraphCompare(cTandDP,mgTandDP,legTandDP,"Temperature and dew point trends","Time","Temperature (#circC)","AP",path_to_figures);