diff --git a/Makefile b/Makefile
index ec064a0cfa0f40806401b7ba00575430cb8bf234..5e6465c0e32c3b8b4bb9a857d0ac35e1f6a810ab 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,11 @@
# try to preserve encoding
CC = g++
-TARGETS = raw grb sol
+TESTS = check-lago
+TARGETS = raw sol example
CFLAGS = -Wall
-all: $(TARGETS)
+all: $(TESTS) $(TARGETS)
raw: raw.cc lago_file.h lago_data.h
$(CC) -o $@ $< $(CFLAGS)
@@ -38,8 +39,18 @@ grb: grb.cc lago_file.h lago_data.h
sol: sol.cc lago_file.h lago_data.h
$(CC) -o $@ $< $(CFLAGS)
+example: example.cc lago_file.h lago_data.h
+ $(CC) -o $@ $< $(CFLAGS)
+
.PHONY: clean
clean:
rm -f $(TARGETS)
+check-lago:
+ifndef LAGO_ANNA
+$(info LAGO_ANNA is not set.)
+$(info I will define it to $PWD, and modify the .bashrc)
+$(shell $(PWD)/lago-anna.sh)
+LAGO_ANNA=$(PWD)
+endif
diff --git a/README b/README
deleted file mode 100644
index 2f5c5dbd1aadfc5fac0cbaa82b7e3a3b8da12454..0000000000000000000000000000000000000000
--- a/README
+++ /dev/null
@@ -1,39 +0,0 @@
-The LAGO Analysis suite
-=======================
-
-CODENAME: ANNA
-COPYRIGHT: (C) 2012-today The LAGO Project, http://lagoproject.org, lago@lagoproject.org
-LICENSE: BSD-3-Clause
-PHILOSOPHY: Free as in Freedom. All our codes are, and always will be, public and open source
-REPOSITORY: https://github.com/lagoproject
-ORIGINAL: Hernán Asorey - 2012, asoreyh@cab.cnea.gov.ar (asoreyh@gmail.com)
-
-DESCRIPTION:
-This is the LAGO data analysis suite. It consists in several files that allow to interact with the different types of data present in the LAGO project. It derive from the lago-process data analysis tools.
-
-lago_file.h: handle different lago data structure files
-lago_data.h: Data analysis library
-lago_defs.h: LAGO definitions for this suite
-
-raw.cc: analyzed "raw" (L0) data and produce the preprocessed "preliminary" (L1) data set.
-sol.cc: code oriented to perform Space Weather related analysis from 1-minute histograms
-grb.cc: code oriented to perform GRB analysis
-
-more fun to come
-
-CONTRIBUTORS:
-If you want to contribute to this project please send me an email (asoreyh@gmail.com) and remember this guidelines:
-
-FILE ENCODING: UTF8 (please use iconv -f YOUR_ENCODING -t UTF-8 file_to_convert > converted_file before to push)
-LANGUAGE: English (preferred)
-INDENT STYLE: Stroustrup (see http://en.wikipedia.org/wiki/Indent_style#Variant:_Stroustrup)
- 1 tab = 4 columns wide (for vim setup use: set tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab
- in general see http://tedlogan.com/techblog3.html)
- Avoid evil whitespaces, use tab instead (Don't commit evil into your repo: http://bit.ly/1K0vQnf )
- If you prefer, please use: astyle -t4 -A4 -y file_to_convert before to push
-VERSIONING: Sequence-based identifiers, v<version>r<release>. First public release: v1r0
-TAGGING: Please don't tag over our repo.
-
-INSTALL:
-
-After installing dependences (only need make, g++ and common libraries), just run make.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..04977d9a8106e97390eac88b1be98c5d9810eace
--- /dev/null
+++ b/README.md
@@ -0,0 +1,23 @@
+#  The LAGO ANNA suite
+
+| CODENAME | ANNA |
+|-------------------|:------|
+| COPYRIGHT | (C) 2012-Today, The LAGO Project, [lagoproject.org](http://lagoproject.org)|
+| LICENSE | BSD-3-Clause |
+| REPOSITORY | https://github.com/lagoproject |
+| CONTACT | [lago@lagoproject.org](mailto:lago@lagoproject.org)|
+| DESCRIPTION | The LAGO project operates its WCD by using different types of electronics, but using a unified data structure. Here you will find the latest stable (prod) version of the data analysis suite of the LAGO Project |
+| CONTRIBUTORS | If you want to contribute to this project please [send us an email](mailto:lago@lagoproject.org)|
+
+
+| CODE GUIDELINES | |
+|-------------------|:------|
+| FILE ENCODING | UTF8 (please use <kbd>iconv -f YOUR_ENCODING -t UTF-8 file_to_convert > converted_file </kbd> before to push) |
+| LANGUAGE | English (preferred) |
+| INDENT STYLE | [Stroustrup](http://en.wikipedia.org/wiki/Indent_style#Variant:_Stroustrup) using 1 tab for 4 columns wide. check [here for vim setup](http://tedlogan.com/techblog3.html) |
+| | If you prefer, please use: <kbd>astyle -t4 -A4 -y file_to_convert</kbd> before to push
+| VERSIONING | Sequence-based identifiers, v<version>r<release>. First public release: **v1r0**
+| INSTALL | After installing dependences (see INSTALL), just *make*
+| USAGE | Please visit our [wikipage](http://wiki.lagoproject.org) (internal use only)|
+
+The [Latin American Giant Observatory (LAGO)](http://lagoproject.org) is an extended Astroparticle Observatory at global scale. It is mainly oriented to basic research on three branches of Astroparticle physics: the Extreme Universe, Space Weather phenomena, and Atmospheric Radiation at ground level.
diff --git a/grb.cc b/example.cc
similarity index 83%
rename from grb.cc
rename to example.cc
index 6f74bbd44962eb8a638a23afec2b5dc3112b4614..f8b872df559d467d91f698372958b5a37c3dc48e 100644
--- a/grb.cc
+++ b/example.cc
@@ -1,10 +1,10 @@
-/* grb.cc -- LAGO grb analysis program
+/* example.cc -- LAGO example on how to include classes
*
* Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
*
* Original authors: Hernán Asorey, Xavier Bertou
* e-mail: asoreyh@cab.cnea.gov.ar (asoreyh@gmail.com)
- * Laboratorio de Detección de PartÃculas y Radiación (LabDPR)
+ * Laboratorio Detección de PartÃculas y Radiación (LabDPR)
* Centro Atómico Bariloche - San Carlos de Bariloche, Argentina
*/
@@ -28,6 +28,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
/************************************************************************/
#define _FILE_OFFSET_BITS 64
+#include "lago_defs.h"
#include "lago_data.h"
#include "lago_file.h"
@@ -38,6 +39,12 @@ using namespace std;
// This is just an example to use LAGO libraries
int main (int argc, char **argv) {
+ if (argc < 2) {
+ cerr << "Error: data file is needed. Please check." << endl;
+ cerr << endl;
+ cerr << "Usage: " << argv[0] << " <file>" << endl;
+ return 1;
+ }
LagoFile Input;
int NbPulses=0;
LagoGeneric Data;
@@ -45,7 +52,7 @@ int main (int argc, char **argv) {
Pulse=(LagoEvent*)malloc(MAXPULSEPERSEC*sizeof(LagoEvent));
for (int i=0;i<MAXPULSEPERSEC;i++)
Pulse[i].Init();
- Input.Open(argv[1]);
+ Input.Open(argv[1]);
//
// File reading and processing
@@ -54,10 +61,12 @@ int main (int argc, char **argv) {
while(NbPulses!=-1) {
NbPulses=Input.ReadOneSecond(&Data,Pulse,MAXPULSEPERSEC);
cout << Data.second << " " << Data.pressure << " " << Data.temperature << " " << NbPulses << endl;
- /* TODO
- if (NbPulses>0)
- TreatSecond(&Data,Pulse,NbPulses);
- */
+ /*
+ * So, Data have one second of pulses, here we should our analysis
+ * say, looking for excesses for grb analysis, something like this:
+ * if (NbPulses>0)
+ * TreatSecond(&Data,Pulse,NbPulses);
+ */
}
return 0;
}
diff --git a/lago-anna.sh b/lago-anna.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8cd7ecfe25cd9165e2985eb26b54c909c4da67ca
--- /dev/null
+++ b/lago-anna.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# lago-anna.sh
+# define LAGO_ANNA and modify .bashrc
+# Copyright (C) 2012-TODAY The LAGO Project, http://lagoproject.org, lago-pi@lagoproject.org
+# Original authors: Hernán Asorey
+# e-mail: asoreyh@cab.cnea.gov.ar (asoreyh@gmail.com)
+# Laboratorio de Detección de PartÃculas y Radiación (LabDPR)
+# Centro Atómico Bariloche - San Carlos de Bariloche, Argentina
+#
+# LICENSE BSD-3-Clause
+# Copyright (c) 2012, The LAGO Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# -*- coding: utf8 -*-
+# try to preserve encoding
+export LAGO_ANNA=${PWD}
+date=$(date -u)
+echo "#
+## Changes added by the LAGO ANNA suite on $date
+#
+export LAGO_ANNA=\"${LAGO_ANNA}\"
+export PATH=\"\${LAGO_ANNA}:\$PATH\"
+" >> ${HOME}/.bashrc
+source ${HOME}/.bashrc
diff --git a/lago_data.h b/lago_data.h
index 337ab481c675db2edcbe65a28f78f6795f8a37dc..355aa041363f76c23b47006d2c43d0fbae474518 100644
--- a/lago_data.h
+++ b/lago_data.h
@@ -28,15 +28,13 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
#ifndef LAGO_DATA_H
#define LAGO_DATA_H
+#ifndef LAGO_DEFS_H
+#include "lago_defs.h"
+#endif
+
#include <iostream>
#include <math.h>
-#define CHANNELS 3
-#define TRACELEN 12
-#define BASELINE 50
-
-#define CODEVER 4
-
class LagoGeneric {
public:
int second;
diff --git a/lago_defs.h b/lago_defs.h
index f1f49778c20645cd9d46dc37552a71e21ce25115..b33a19360a184d9fa6c29c943c5f414b924cd4bd 100644
--- a/lago_defs.h
+++ b/lago_defs.h
@@ -29,7 +29,14 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
#ifndef LAGO_DEFS_H
#define LAGO_DEFS_H
-#define PROJECT "LAGO Data Analysis Suite"
+#define PROJECT "The LAGO ANNA Suite"
#define CODENAME "ANNA"
-#define VERSION "v1r0"
+// DATAVERSION AND CODEVERSION SHOULD BE THE SAME NUMBER
+#define CODEVERSION "v5"
+#define DATAVERSION 5
+
+#define CHANNELS 3
+#define TRACELEN 12
+#define BASELINE 50
+
#endif
diff --git a/lago_file.h b/lago_file.h
index d1f54262807bf9e6c8ab138f6f001fbe70a3b5ea..4dcd8152c7b32e7668f79ebd07ceea2dc092d0c8 100644
--- a/lago_file.h
+++ b/lago_file.h
@@ -29,8 +29,14 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
#ifndef LAGO_FILE_H
#define LAGO_FILE_H
+#ifndef LAGO_DEFS_H
#include "lago_defs.h"
+#endif
+
+#ifndef LAGO_DATA_H
#include "lago_data.h"
+#endif
+
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
@@ -101,8 +107,8 @@ class LagoFile {
case 'v': // version check
double ver;
sscanf(line, "# v %lf\n", &ver);
- if (ver > 1 && ver != CODEVER) {
- std::cerr << "This code is prepared to work with LAGO raw data version " << CODEVER << std::endl;
+ if (ver > 1 && ver != DATAVERSION) {
+ std::cerr << "This code is prepared to work with LAGO raw data version " << DATAVERSION << std::endl;
std::cerr << "Raw data was obtained using LAGO version " << ver << std::endl;
if (!force) {
std::cerr << "See you later." << std::endl;
diff --git a/raw.cc b/raw.cc
index 11f81749c4572f30260ef96771d7c884dce92152..6b3cf6cf4669da8f0a47e985c196834fd8002fcf 100644
--- a/raw.cc
+++ b/raw.cc
@@ -33,14 +33,15 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
#include <string.h>
#include <vector>
#include <fstream>
-using namespace std;
-
+#include "lago_defs.h"
#include "lago_data.h"
#include "lago_file.h"
+using namespace std;
+
+// Local defines
#define MAXPULSEPERSEC 1000000
#define MAXTIMEINVECTOR 40000
-
#define SCL_LEVELS 4
#define SCL_BINS 200
#define SCL_TIME (1./SCL_BINS)
@@ -322,38 +323,55 @@ void TreatSecond(LagoGeneric *Data, LagoEvent*Pulse, int NbPulses) {
void Usage(char *prog, int verbose=0)
{
- cout << endl << PROJECT << " " << VERSION << endl;
- cout << endl << "LAGO raw data analysis (L0 -> L1)" << endl << endl;
- cout << "Usage: " << prog << " [flags] raw_file" << endl;
- cout << " Options (note they are case sensitive!):"<<endl;
- cout << " -h: prints help and exits"<<endl;
- cout << " -c: produces .cal calibration file"<<endl;
- cout << " -s: produces .sol solar physics file"<<endl;
- cout << " -t <a/p>: produces .tim time difference histogram file," << endl << " filtering by a/p is a value is given (default = no)"<<endl;
- cout << " -r: produces .raw " << raw_limit << " second raw file copy"<<endl;
- cout << " -a: produces .all.bz2 compressed file containing charge," << endl << " peak, dc and dt for all pulses"<<endl;
- cout << " -m: produces .mon monitoring file"<<endl;
- cout << " -n <time>: produces .rte scaler file with total number of pulses" << endl << " per second. It is enabled by default when -l option is used."<< endl << " If time (in seconds) is given, it also produces a .flx (flux)" << endl << " file with averaged rates over <time> seconds."<<endl;
- cout << " -l: produces .scl scaler data file (old lago analysis)"<<endl;
- cout << " -g: produces .scl scaler data file (old lago analysis), with" << endl << " absolute thresholds (should be used with -l)"<<endl;
- cout << " -v <channel (1-3)>: checks channel is correct (bits and baseline)"<<endl;
- cout << endl << " Flags and modifiers:"<<endl;
- cout << " -f: force analysis"<<endl;
- cout << " -z: produces bzip2 compressed files (solar and scaler data)"<<endl;
- cout << " -N <channel mask 1-7>: channels having negative undershoots"<<endl;
- cout << " -l <ch>";
- for (int i=0; i<SCL_LEVELS; i++)
- cout << " <l" << i+1 << ">";
- cout << ": Define the " << SCL_LEVELS << " thresholds for" << endl << " old-lago-like analysis on channel <ch>"<<endl;
- cout << " Default thresholds: ";
+ cout << "\t" << PROJECT << endl;
+ cout << "\tData analisys suite for the LAGO Project (L0 -> L1)" << endl;
+ cout << endl;
+ cout << "\t(c) 2012-Today, The LAGO Project, http://lagoproject.org" << endl;
+ cout << "\t(c) 2012, LabDPR, http://labdpr.cab.cnea.gov.ar" << endl;
+ cout << endl;
+ cout << "\tThe LAGO Project, lago@lagoproject.org" << endl;
+ cout << endl;
+ cout << "\tDPR Lab. 2012" << endl;
+ cout << "\tH. Asorey, asoreyh@cab.cnea.gov.ar" << endl;
+ cout << endl;
+ cout << "Usage: " << prog << " [modifiers] <options> <values> raw_file" << endl;
+ cout << endl;
+ cout << "\tOptions and values:"<< endl;
+ cout << "\t-t <a/p> \tproduces .tim time difference histogram file," << endl;
+ cout << "\t \tfiltering by a/p if a value is given (default = no)" << endl;
+ cout << "\t-n <time>\tproduces .rte scaler file with total number of pulses" << endl;
+ cout << "\t \tper second. It is enabled by default when -l option" << endl;
+ cout << "\t \tis used." << endl;
+ cout << "\t \tIf time (in seconds) is given, it also produces a .flx" << endl;
+ cout << "\t \tflux file with averaged rates over <time> seconds." << endl;
+ cout << "\t-v <chn> \tchecks if channel (1-3) is working (bits and baseline)" << endl;
+ cout << "\t-N <mask>\tindicate what channels have negative undershoots" << endl;
+ cout << "\t \tUse channel mask 1-7." << endl;
+ cout << "\t-u <tr i>\tImpose an offline trigger level for each channel" << endl;
+ cout << "\t \tDefault value: " << trg_default << " ADC)" << endl;
+ cout << "\t-l <ch> <t_i>\tdefines the " << SCL_LEVELS << " thresholds t_i for the old" << endl;
+ cout << "\t \tlago-like scalers analysis on channel <ch>."<< endl;
+ cout << "\t \tFor example: -l 1 5 15 30 50, defines subchannels" << endl;
+ cout << "\t \tthresholds for ch 1" << endl;
+ cout << "\t \tDefault thresholds (using -l <ch>): ";
for (int i=0; i<SCL_LEVELS; i++)
cout << scl_default[i] << " ";
cout << endl;
- cout << " -u <trigger ch1> <trigger ch2> <trigger ch3>: impose an offline" << endl << " trigger level for each channel (default value: " << trg_default << " ADC)" << endl;
cout << endl;
- if (verbose) {
- // verbose help
- }
+ cout << "\tModifiers (note they are case sensitive!):" << endl;
+ cout << "\t-h\tprints help and exits" << endl;
+ cout << "\t-c\tproduces the .cal calibration file" << endl;
+ cout << "\t-s\tproduces the .sol solar physics file" << endl;
+ cout << "\t-r\tproduces the .raw " << raw_limit << " second raw file copy" << endl;
+ cout << "\t-m\tproduces the .mon monitoring file" << endl;
+ cout << "\t-f\tforce analysis for older data versions than " << CODEVERSION << endl;
+ cout << "\t-z\tproduces bzip2 compressed files (solar and scaler data)"<<endl;
+ cout << "\t-l\tproduces .scl scaler data file (old lago analysis)"<<endl;
+ cout << "\t-g\tproduces .scl scaler data file (old lago analysis), but" << endl;
+ cout << "\t \tabsolute thresholds (should be used with -l)" << endl;
+ cout << "\t-a\tproduces the .all.bz2 compressed file containing charge," << endl;
+ cout << "\t \tpeak, dc and dt, rise time and fall time for all pulses" << endl;
+ cout << endl;
exit(1);
}
@@ -520,7 +538,7 @@ int main (int argc, char *argv[])
if (strrchr(ifile2,'/')!=NULL) {
ifile2=strrchr(ifile2,'/')+1;
}
- snprintf(ifile, 256,"l1_%s_%s",VERSION,ifile2);
+ snprintf(ifile, 256,"l1_%s_%s",CODEVERSION,ifile2);
if (strrchr(ifile,'.')!=NULL) {
if (strncmp(strrchr(ifile,'.'),".bz2",4)==0) { // remove .bz2 if present
*(strrchr(ifile,'.'))='\0';
@@ -625,7 +643,7 @@ int main (int argc, char *argv[])
}
if (ical) {
- cal << "# # # p 1 cal " << PROJECT << " " << VERSION << endl;
+ cal << "# # # p 1 cal " << PROJECT << " " << CODEVERSION << endl;
cal << "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)" << endl;
cal << "# # This is a file containing the charge and peak calibration histograms" << endl;
cal << "# # Format is ch1 ch2 ch3 pk1 pk2 pk3" << endl;
@@ -634,7 +652,7 @@ int main (int argc, char *argv[])
}
if (itim) {
- tim << "# # # p 1 tim " << PROJECT << " " << VERSION << endl;
+ tim << "# # # p 1 tim " << PROJECT << " " << CODEVERSION << endl;
tim << "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)" << endl;
tim << "# # This is a file containing the time difference histogram" << endl;
tim << "# # Format is #time_difference(ns) #count for each channel" << endl;
@@ -645,13 +663,13 @@ int main (int argc, char *argv[])
}
if (iraw) {
- raw << "# # # p 1 raw " << PROJECT << " " << VERSION << endl;
+ raw << "# # # p 1 raw " << PROJECT << " " << CODEVERSION << endl;
raw << "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)" << endl;
raw << "# # This is a RAW file containing the first 10 seconds of data" << endl;
}
if (isol) {
- fprintf(sol, "# # # p 1 sol %s %s\n", PROJECT, VERSION);
+ fprintf(sol, "# # # p 1 sol %s %s\n", PROJECT, CODEVERSION);
fprintf(sol, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
fprintf(sol, "# # This is a Solar data file.\n");
fprintf(sol, "# # These are one minute charge and peak histograms, with monitoring information\n");
@@ -664,7 +682,7 @@ int main (int argc, char *argv[])
}
if (iall) {
- fprintf(all, "# # # p 1 all %s %s\n", PROJECT, VERSION);
+ fprintf(all, "# # # p 1 all %s %s\n", PROJECT, CODEVERSION);
fprintf(all, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
fprintf(all, "# # This is a file containing all processed data\n");
fprintf(all, "# # Format is # second frequency temperature pressure\n");
@@ -675,14 +693,14 @@ int main (int argc, char *argv[])
}
if (imon) {
- fprintf(mon, "# # # p 1 all %s %s\n", PROJECT, VERSION);
+ fprintf(mon, "# # # p 1 all %s %s\n", PROJECT, CODEVERSION);
fprintf(mon, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
fprintf(mon, "# # This is a monitoring file.\n");
fprintf(mon, "# # Format is second frequency temperature pressure average_baseline_chN dev_baseline_chN\n");
}
if (iscl) {
- fprintf(scl, "# # # p 1 scl %s %s\n", PROJECT, VERSION);
+ fprintf(scl, "# # # p 1 scl %s %s\n", PROJECT, CODEVERSION);
fprintf(scl, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
fprintf(scl, "# # This is the old-lago-like scaler file.\n");
fprintf(scl, "# # Format is:\n");
@@ -704,14 +722,14 @@ int main (int argc, char *argv[])
fprintf(scl, "# # An offline trigger of %d %d %d ADC above baseline has been used for each channel respectively.\n", trg_level[0], trg_level[1], trg_level[2]);
}
if (irte) {
- fprintf(rte, "# # # p 1 rte %s %s\n", PROJECT, VERSION);
+ fprintf(rte, "# # # p 1 rte %s %s\n", PROJECT, CODEVERSION);
fprintf(rte, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
fprintf(rte, "# # This is the rate (pulse per second) file.\n");
fprintf(rte, "# # Format is:\n");
fprintf(rte, "# # second temperature pressure Total_Rate Rate_per_channel:_(%d)_columns\n",CHANNELS);
}
if (iflx) {
- fprintf(flx, "# # # p 1 flx %s %s\n", PROJECT, VERSION);
+ fprintf(flx, "# # # p 1 flx %s %s\n", PROJECT, CODEVERSION);
fprintf(flx, "# # L1 level file (processed raw data, use at your own risk or contact lago@lagoproject.org)\n");
fprintf(flx, "# # This is the flux file.\n");
fprintf(flx, "# # Format is:\n");
diff --git a/sol.cc b/sol.cc
index d3311608ce5eca7aee54ae36741ec1cbfa303000..2f6cd7cbeea2b21af9a48d3b3d0d3147c9cd90fd 100644
--- a/sol.cc
+++ b/sol.cc
@@ -101,7 +101,7 @@ double fitHisto(int xi, int xf, int* h, double* r)
void Usage(char *prog)
{
- cout << endl << PROJECT << " " << VERSION << endl;
+ cout << endl << PROJECT << " " << CODEVERSION << endl;
cout << endl << "This is the Space Weather dedicated analysis (L1 -> L2SW)" << endl<< endl;
cout << " Analyze .sol output files to identify solar modulation phenomena." << endl;
cout << " Usage: " << prog << " [flags] <filename>.sol.bz2" << endl;
@@ -269,7 +269,7 @@ int main (int argc, char *argv[])
fprintf(stderr,"\n## ERROR ## Failed to open log file. Abort.\n");
exit(1);
}
- fprintf(lof, "# # # L2 log %s %s\n", PROJECT, VERSION);
+ fprintf(lof, "# # # L2 log %s %s\n", PROJECT, CODEVERSION);
fprintf(lof, "# # L2 level file (lago@lagoproject.org): fit log for the sol automatic procedure\n");
fprintf(lof, "## STATUS ## Analyzing %s\n", ifile);
@@ -331,7 +331,7 @@ int main (int argc, char *argv[])
}
// headers
- fprintf(out, "# # # L2 flx %s %s\n", PROJECT, VERSION);
+ fprintf(out, "# # # L2 flx %s %s\n", PROJECT, CODEVERSION);
fprintf(out, "# # L2 level file (lago@lagoproject.org): flux of signals as function of time\n");
fprintf(out, "# # Analysis is done by integrating the whole channel %d charge histogram in\n", channel);
if (iband) {
@@ -351,7 +351,7 @@ int main (int argc, char *argv[])
fprintf(out, "# # utc pressure temperature total_flux(count/min)\n");
}
if (iauto) {
- fprintf(muo, "# # # L2 flx %s %s\n", PROJECT, VERSION);
+ fprintf(muo, "# # # L2 flx %s %s\n", PROJECT, CODEVERSION);
fprintf(muo, "# # L2 level file (lago@lagoproject.org): flux of signals as function of time\n");
fprintf(muo, "# # Analysis is done by automaticaly detection of calibration histogram features\n");
fprintf(muo, "# # on channel %d, and integrating the flux in four different bands of deposited energy.\n", channel);
@@ -557,7 +557,7 @@ int main (int argc, char *argv[])
fprintf(stderr,"\n## ERROR ## Failed to open pos file. Abort.\n");
exit(1);
}
- fprintf(pof, "# # # L2 pos %s %s\n", PROJECT, VERSION);
+ fprintf(pof, "# # # L2 pos %s %s\n", PROJECT, CODEVERSION);
fprintf(pof, "# # L2 level file (lago@lagoproject.org): file to check goodness of fit for automatic detection\n");
fprintf(pof, "# # 4 columns format is:\n");
fprintf(pof, "# # Feature_Index Seed_for_fit Feature analyzed_file\n");