HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Pull Request !290

Closed

Pull request !290 Created on by

perrinel

- Merge branch 'feature/ProgressAndCancel' into develop
- Fix progression bug when aborting a request for Amda plugin
- See last commit
- Fix bug when creating two variables crash the app.
- Update networkcontroller for abort mechanism

Commit flow:

branch:develop of GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation → branch:develop of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Versions:

Pull request versions not available.

Expand 12 commits

ver	Time	Author	Commit	Description
`latest`	Thu, 21 Sep 2017 16:04:25	perrinel	`r704:ff170594501a`	Implementation of automatic cancel for request that failed
`latest`	Thu, 21 Sep 2017 14:01:10	perrinel	`r703:ba0e6f7d7791`	Correction for MR
`v1`	Thu, 21 Sep 2017 09:01:47	perrinel	`r702:7c5b3263c65b`	Merge branch 'feature/ProgressAndCancel' into develop
`v1`	Thu, 21 Sep 2017 08:57:57	perrinel	`r701:87c4dffdd5b8`	Fix progression bug when aborting a request for Amda plugin
`v1`	Thu, 21 Sep 2017 08:57:57	perrinel	`r700:bef126514bff`	See last commit
`v1`	Thu, 21 Sep 2017 08:57:57	perrinel	`r699:a7f60f6512e6`	Fix bug when creating two variables crash the app. Variable as now invalid range and cache range at creation
`v1`	Thu, 21 Sep 2017 08:57:56	perrinel	`r698:076c09acb9f6`	Update networkcontroller for abort mechanism
`v1`	Thu, 21 Sep 2017 08:57:56	perrinel	`r697:2015ea331dc4`	Implementation of abort mechanism
`v1`	Thu, 21 Sep 2017 08:57:56	perrinel	`r696:450aab29f079`	update clang format for qcustomplot
`v1`	Thu, 21 Sep 2017 08:57:56	perrinel	`r695:22c6ca1df132`	Implement progression for AmdaProvider.
`v1`	Thu, 21 Sep 2017 08:57:56	perrinel	`r694:34234d13df5c`	request is now passed by shared pointer instead of const &
`v1`	Thu, 21 Sep 2017 08:57:56	perrinel	`r693:f189aafd213c`	Implementation of progression
12 commits hidden, click expand to show them.

Expand all files

core/src/Variable/VariableCacheStrategy.cpp created 644 +52 0

			@@ -0,0 +1,52
		1	#include "Variable/VariableCacheStrategy.h"
		2
		3	#include "Settings/SqpSettingsDefs.h"
		4
		5	#include "Variable/Variable.h"
		6	#include "Variable/VariableController.h"
		7
		8	Q_LOGGING_CATEGORY(LOG_VariableCacheStrategy, "VariableCacheStrategy")
		9
		10	struct VariableCacheStrategy::VariableCacheStrategyPrivate {
		11	VariableCacheStrategyPrivate() : m_CacheStrategy{CacheStrategy::FixedTolerance} {}
		12
		13	CacheStrategy m_CacheStrategy;
		14	};
		15
		16
		17	VariableCacheStrategy::VariableCacheStrategy(QObject *parent)
		18	: QObject{parent}, impl{spimpl::make_unique_impl<VariableCacheStrategyPrivate>()}
		19	{
		20	}
		21
		22	std::pair<SqpRange, SqpRange>
		23	VariableCacheStrategy::computeStrategyRanges(const SqpRange &vRange, const SqpRange &rangeRequested)
		24	{
		25
		26	auto varRanges = std::pair<SqpRange, SqpRange>{};
		27
		28	auto toleranceFactor = SqpSettings::toleranceValue(GENERAL_TOLERANCE_AT_UPDATE_KEY,
		29	GENERAL_TOLERANCE_AT_UPDATE_DEFAULT_VALUE);
		30	auto tolerance = toleranceFactor * (rangeRequested.m_TEnd - rangeRequested.m_TStart);
		31
		32	switch (impl->m_CacheStrategy) {
		33	case CacheStrategy::FixedTolerance: {
		34	varRanges.first = rangeRequested;
		35	varRanges.second
		36	= SqpRange{rangeRequested.m_TStart - tolerance, rangeRequested.m_TEnd + tolerance};
		37	break;
		38	}
		39
		40	case CacheStrategy::TwoThreashold: {
		41	// TODO Implement
		42	break;
		43	}
		44	default:
		45	qCCritical(LOG_VariableCacheStrategy())
		46	<< tr("Impossible to use compute the cache range with an unknow cache strategy");
		47	// No action
		48	break;
		49	}
		50
		51	return varRanges;
		52	}

build_cfg/mac/install_script.sh 0 -1

              install_name_tool -change @rpath/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui /tmp/SciQLOP.app/Contents/MacOS/sciqlop
              install_name_tool -change @rpath/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets /tmp/SciQLOP.app/Contents/MacOS/sciqlop
              install_name_tool -change @rpath/QtNetwork.framework/Versions/5/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork /tmp/SciQLOP.app/Contents/MacOS/sciqlop
-             install_name_tool -change @rpath/QtSvg.framework/Versions/5/QtSvg @executable_path/../Frameworks/QtSvg.framework/Versions/5/QtSvg /tmp/SciQLOP.app/Contents/MacOS/sciqlop

core/include/Data/SqpIterator.h +1 -5

                  virtual ~SqpIterator() noexcept = default;
                  SqpIterator(const SqpIterator &) = default;
-                 SqpIterator &operator=(SqpIterator other)
+                 {
-                     swap(m_CurrentValue, other.m_CurrentValue);
-                     return *this;
+                 }
+                 SqpIterator &operator=(SqpIterator other) { swap(m_CurrentValue, other.m_CurrentValue); }
                  SqpIterator &operator++()
                  {

core/include/Variable/VariableCacheStrategy.h +11 -8

              /**
               * Possible types of zoom operation
               */
-             // enum class CacheStrategy { FixedTolerance, TwoThreashold };
+             enum class CacheStrategy { FixedTolerance, TwoThreashold };
              /// This class aims to hande the cache strategy.
-             class SCIQLOP_CORE_EXPORT VariableCacheStrategy {
+             class SCIQLOP_CORE_EXPORT VariableCacheStrategy : public QObject {
+                 Q_OBJECT
              public:
-                 virtual std::pair<SqpRange, SqpRange> computeRange(const SqpRange &vRange,
-                                                                    const SqpRange &rangeRequested)
-                     = 0;
-             };
+                 explicit VariableCacheStrategy(QObject *parent = 0);
+                 std::pair<SqpRange, SqpRange> computeStrategyRanges(const SqpRange &vRange,
+                                                                     const SqpRange &rangeRequested);
+             private:
+                 class VariableCacheStrategyPrivate;
+                 spimpl::unique_impl_ptr<VariableCacheStrategyPrivate> impl;
+             };
              #endif // SCIQLOP_VARIABLECACHESTRATEGY_H

core/src/Data/DataSeriesIterator.cpp +1 0

              int DataSeriesIteratorValue::distance(const DataSeriesIteratorValue &other) const
              {
+                 auto dist = m_Impl->distance(*other.m_Impl);
                  return m_Impl->distance(*other.m_Impl);
              }

core/src/Data/VectorSeries.cpp +8 -5

              std::shared_ptr<IDataSeries> VectorSeries::subDataSeries(const SqpRange &range)
              {
                  auto subXAxisData = std::vector<double>();
-                 auto subValuesData = std::vector<double>();
+                 auto subXValuesData = std::vector<double>();
+                 auto subYValuesData = std::vector<double>();
+                 auto subZValuesData = std::vector<double>();
                  this->lockRead();
                  {
                      auto bounds = xAxisRange(range.m_TStart, range.m_TEnd);
                      for (auto it = bounds.first; it != bounds.second; ++it) {
                          subXAxisData.push_back(it->x());
-                         subValuesData.push_back(it->value(0));
-                         subValuesData.push_back(it->value(1));
-                         subValuesData.push_back(it->value(2));
+                         subXValuesData.push_back(it->value(0));
+                         subYValuesData.push_back(it->value(1));
+                         subZValuesData.push_back(it->value(2));
                      }
                  }
                  this->unlock();
-                 return std::make_shared<VectorSeries>(std::move(subXAxisData), std::move(subValuesData),
+                 return std::make_shared<VectorSeries>(std::move(subXAxisData), std::move(subXValuesData),
+                                                       std::move(subYValuesData), std::move(subZValuesData),
                                                        this->xAxisUnit(), this->valuesUnit());
              }

core/src/Variable/VariableController.cpp +4 -12

              #include <Variable/Variable.h>
              #include <Variable/VariableAcquisitionWorker.h>
              #include <Variable/VariableCacheStrategy.h>
-             #include <Variable/VariableCacheStrategyFactory.h>
              #include <Variable/VariableController.h>
              #include <Variable/VariableModel.h>
              #include <Variable/VariableSynchronizationGroup.h>
                          : m_WorkingMutex{},
                            m_VariableModel{new VariableModel{parent}},
                            m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
-                           // m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
-                           m_VariableCacheStrategy{VariableCacheStrategyFactory::createCacheStrategy(
-                               CacheStrategy::SingleThreshold)},
+                           m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
                            m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()},
                            q{parent}
                  {
                  auto varId = m_VariableToIdentifierMap.at(var);
                  auto varStrategyRangesRequested
-                     = m_VariableCacheStrategy->computeRange(var->range(), rangeRequested);
-                 auto notInCacheRangeList = QVector<SqpRange>{varStrategyRangesRequested.second};
-                 auto inCacheRangeList = QVector<SqpRange>{};
-                 if (m_VarIdToVarRequestIdQueueMap.find(varId) == m_VarIdToVarRequestIdQueueMap.cend()) {
-                     notInCacheRangeList = var->provideNotInCacheRangeList(varStrategyRangesRequested.second);
-                     inCacheRangeList = var->provideInCacheRangeList(varStrategyRangesRequested.second);
+                 }
+                     = m_VariableCacheStrategy->computeStrategyRanges(var->range(), rangeRequested);
+                 auto notInCacheRangeList = var->provideNotInCacheRangeList(varStrategyRangesRequested.second);
+                 auto inCacheRangeList = var->provideInCacheRangeList(varStrategyRangesRequested.second);
                  if (!notInCacheRangeList.empty()) {
                      varRequest.m_RangeRequested = varStrategyRangesRequested.first;

core/tests/meson.build +1 -2

                [['Data/TestTwoDimArrayData.cpp'],'test_2d','Two Dim Array test'],
                [['DataSource/TestDataSourceController.cpp'],'test_data_source','DataSourceController test'],
                [['Variable/TestVariableCacheController.cpp'],'test_variable_cache','VariableCacheController test'],
-               [['Variable/TestVariable.cpp'],'test_variable','Variable test'],
-               [['Variable/TestVariableSync.cpp'],'test_variable_sync','Variable synchronization test']
+               [['Variable/TestVariable.cpp'],'test_variable','Variable test']
              ]
              foreach unit_test : tests

gui/include/Variable/RenameVariableDialog.h 0 -1

               * @brief The RenameVariableDialog class represents the dialog to rename a variable
               */
              class RenameVariableDialog : public QDialog {
-                 Q_OBJECT
              public:
                  explicit RenameVariableDialog(const QString &defaultName,
                                                const QVector<QString> &forbiddenNames,

gui/meson.build 0 -3

                'include/SqpApplication.h',
                'include/TimeWidget/TimeWidget.h',
                'include/Variable/VariableInspectorWidget.h',
-               'include/Variable/RenameVariableDialog.h',
                'include/Visualization/qcustomplot.h',
                'include/Visualization/VisualizationGraphWidget.h',
                'include/Visualization/VisualizationTabWidget.h',
                'ui/SidePane/SqpSidePane.ui',
                'ui/TimeWidget/TimeWidget.ui',
                'ui/Variable/VariableInspectorWidget.ui',
-               'ui/Variable/RenameVariableDialog.ui',
                'ui/Variable/VariableMenuHeaderWidget.ui',
                'ui/Visualization/VisualizationGraphWidget.ui',
                'ui/Visualization/VisualizationTabWidget.ui',
                'src/TimeWidget/TimeWidget.cpp',
                'src/Variable/VariableInspectorWidget.cpp',
                'src/Variable/VariableMenuHeaderWidget.cpp',
-               'src/Variable/RenameVariableDialog.cpp',
                'src/Visualization/VisualizationGraphHelper.cpp',
                'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
                'src/Visualization/VisualizationGraphWidget.cpp',

gui/src/Variable/VariableInspectorWidget.cpp +9 -20

                                      auto variableModel = sqpApp->variableController().variableModel();
                                      variableModel->abortProgress(index);
                                  }
-                                 return true;
                              }
                              else {
-                                 return QStyledItemDelegate::editorEvent(event, model, option, index);
+                                 QStyledItemDelegate::editorEvent(event, model, option, index);
                              }
                          }
                          else {
-                             return QStyledItemDelegate::editorEvent(event, model, option, index);
+                             QStyledItemDelegate::editorEvent(event, model, option, index);
                          }
                      }
                      else {
-                         return QStyledItemDelegate::editorEvent(event, model, option, index);
+                         QStyledItemDelegate::editorEvent(event, model, option, index);
                      }
-                     return QStyledItemDelegate::editorEvent(event, model, option, index);
                  }
              };
                      if (selectedVariables.size() == 1) {
                          auto selectedVariable = selectedVariables.front();
-                         auto duplicateFun = [varW = std::weak_ptr<Variable>(selectedVariable)]()
+                         {
-                             if (auto var = varW.lock()) {
-                                 sqpApp->variableController().cloneVariable(var);
+                             }
+                         auto duplicateFun = [&selectedVariable]() {
+                             sqpApp->variableController().cloneVariable(selectedVariable);
                          };
                          tableMenu.addAction(tr("Duplicate"), duplicateFun);
-                         auto renameFun = [ varW = std::weak_ptr<Variable>(selectedVariable), &model, this ]()
+                         {
-                             if (auto var = varW.lock()) {
+                         auto renameFun = [&selectedVariable, &model, this]() {
-                                 // Generates forbidden names (names associated to existing variables)
-                                 auto allVariables = model->variables();
-                                 auto forbiddenNames = QVector<QString>(allVariables.size());
-                                 std::transform(allVariables.cbegin(), allVariables.cend(),
-                                                forbiddenNames.begin(),
+                             std::transform(allVariables.cbegin(), allVariables.cend(), forbiddenNames.begin(),
-                                                [](const auto &variable) { return variable->name(); });
-                                 RenameVariableDialog dialog{var->name(), forbiddenNames, this};
+                             RenameVariableDialog dialog{selectedVariable->name(), forbiddenNames, this};
-                                 if (dialog.exec() == QDialog::Accepted) {
-                                     var->setName(dialog.name());
+                                 }
+                                 selectedVariable->setName(dialog.name());
                              }
                          };

plugins/amda/meson.build +1 -2

              amdaplugin_moc_headers = [
-               'include/AmdaPlugin.h',
-               'include/AmdaProvider.h'
+               'include/AmdaPlugin.h'
              ]
              amdaplugin_sources = [

plugins/amda/src/AmdaProvider.cpp +2 -3

              /// - %1: start date
              /// - %2: end date
              /// - %3: parameter id
-             /// Old url: http://amda.irap.omp.eu/php/rest/
              const auto AMDA_URL_FORMAT = QStringLiteral(
-                 "http://amdatest.irap.omp.eu/php/rest/"
+                 "http://amda.irap.omp.eu/php/rest/"
                  "getParameter.php?startTime=%1&stopTime=%2&parameterID=%3&outputFormat=ASCII&"
                  "timeFormat=ISO8601&gzip=0");
                            // Don't do anything if the reply was abort
                            if (reply->error() == QNetworkReply::NoError) {
-                               auto downloadFileUrl = QUrl{QString{reply->readAll()}.trimmed()};
+                               auto downloadFileUrl = QUrl{QString{reply->readAll()}};
                                qCInfo(LOG_AmdaProvider())
                                    << tr("TORM AmdaProvider::retrieveData downloadFileUrl:") << downloadFileUrl;

plugins/amda/src/AmdaResultParser.cpp +20 -36

              /// Message in result file when the file was not found on server
              const auto FILE_NOT_FOUND_MESSAGE = QStringLiteral("Not Found");
-             /// Separator between values in a result line
-             const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};
-             /// Regex to find the header of the data in the file. This header indicates the end of comments in
-             /// the file
-             const auto DATA_HEADER_REGEX = QRegularExpression{QStringLiteral("#\\s*DATA\\s*:")};
              /// Format for dates in result files
              const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");
-             /// Regex to find unit in a line. Examples of valid lines:
-             /// ... PARAMETER_UNITS : nT ...
-             /// ... PARAMETER_UNITS:nT ...
-             /// ... PARAMETER_UNITS:   m² ...
-             /// ... PARAMETER_UNITS : m/s ...
-             const auto UNIT_REGEX = QRegularExpression{QStringLiteral("\\s*PARAMETER_UNITS\\s*:\\s*(.+)")};
+             /// Separator between values in a result line
+             const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};
-             QDateTime dateTimeFromString(const QString &stringDate) noexcept
+             {
-             #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
-                 return QDateTime::fromString(stringDate, Qt::ISODateWithMs);
-             #else
-                 return QDateTime::fromString(stringDate, DATE_FORMAT);
-             #endif
+             }
+             /// Regex to find unit in a line. Examples of valid lines:
+             /// ... - Units : nT - ...
+             /// ... -Units:nT- ...
+             /// ... -Units:   m²- ...
+             /// ... - Units : m/s - ...
+             const auto UNIT_REGEX = QRegularExpression{QStringLiteral("-\\s*Units\\s*:\\s*(.+?)\\s*-")};
              /// Converts a string date to a double date
              /// @return a double that represents the date in seconds, NaN if the string date can't be converted
              double doubleDate(const QString &stringDate) noexcept
              {
-                 // Format: yyyy-MM-ddThh:mm:ss.zzz
-                 auto dateTime = dateTimeFromString(stringDate);
+                 auto dateTime = QDateTime::fromString(stringDate, DATE_FORMAT);
                  dateTime.setTimeSpec(Qt::UTC);
                  return dateTime.isValid() ? DateUtils::secondsSinceEpoch(dateTime)
                                            : std::numeric_limits<double>::quiet_NaN();
              {
                  QString line{};
-                 // Searches unit in the comment lines (as long as the reading has not reached the data header)
-                 while (stream.readLineInto(&line) && !line.contains(DATA_HEADER_REGEX)) {
+                 // Searches unit in the comment lines
+                 while (stream.readLineInto(&line) && isCommentLine(line)) {
                      auto match = UNIT_REGEX.match(line);
                      if (match.hasMatch()) {
                          return Unit{match.captured(1), true};
              std::pair<std::vector<double>, std::vector<double> >
              readResults(QTextStream &stream, AmdaResultParser::ValueType valueType)
              {
-                 auto expectedNbValues = nbValues(valueType) + 1;
+                 auto expectedNbValues = nbValues(valueType);
                  auto xData = std::vector<double>{};
                  auto valuesData = std::vector<double>{};
                  QString line{};
-                 // Skip comment lines
-                 while (stream.readLineInto(&line) && isCommentLine(line)) {
+                 }
-                 if (!stream.atEnd()) {
-                     do {
+                 while (stream.readLineInto(&line)) {
+                     // Ignore comment lines
+                     if (!isCommentLine(line)) {
                          auto lineData = line.split(RESULT_LINE_SEPARATOR, QString::SkipEmptyParts);
-                         if (lineData.size() == expectedNbValues) {
+                         if (lineData.size() == expectedNbValues + 1) {
                              // X : the data is converted from date to double (in secs)
                              auto x = doubleDate(lineData.at(0));
                                  xData.push_back(x);
                                  // Values
-                                 for (auto valueIndex = 1; valueIndex < expectedNbValues; ++valueIndex) {
-                                     auto column = valueIndex;
+                                 for (auto valueIndex = 0; valueIndex < expectedNbValues; ++valueIndex) {
+                                     auto column = valueIndex + 1;
                                      bool valueOk;
                                      auto value = lineData.at(column).toDouble(&valueOk);
                              qCWarning(LOG_AmdaResultParser())
                                  << QObject::tr("Can't retrieve results from line %1: invalid line").arg(line);
                          }
-                     } while (stream.readLineInto(&line));
+                     }
                  }
                  return std::make_pair(std::move(xData), std::move(valuesData));
                  auto xAxisUnit = readXAxisUnit(stream);
                  // Reads results
+                 stream.seek(0); // returns to the beginning of the file
                  auto results = readResults(stream, valueType);
                  // Creates data series

plugins/amda/tests-resources/TestAmdaResultParser/NaNValue.txt +3 -61

		@@ -1,64 +1,6
1		# -----------
2		# AMDA INFO :
3		# -----------
4		# AMDA_ABOUT : Created by CDPP/AMDA(c)
5		# AMDA_VERSION : 3.5.0
6		# AMDA_ACKNOWLEDGEMENT : CDPP/AMDA Team
7		#
8		# --------------
9		# REQUEST INFO :
10		# --------------
11		# REQUEST_STRUCTURE : one-file-per-parameter-per-interval
12		# REQUEST_TIME_FORMAT : ISO 8601
13		# REQUEST_OUTPUT_PARAMS : imf
14		#
15		# -----------------
16		# BASE PARAMETERS :
17		# -----------------
18		#
19		# MISSION_ID : NONE
20		#
21		# INSTRUMENT_ID : NONE
22		#
23		# DATASET_ID : ace-imf-all
24		# DATASET_NAME : final / prelim
25		# DATASET_DESCRIPTION : Interplanetary Magnetic Field 16-sec Level2/PRELIM Data
26		# DATASET_SOURCE : CDPP/DDServer
27		# DATASET_GLOBAL_START : 1997-09-02T00:00:12.000
28		# DATASET_GLOBAL_STOP : 2017-09-16T23:59:57.000
29		# DATASET_MIN_SAMPLING : 16
30		# DATASET_MAX_SAMPLING : 16
31		# DATASET_CAVEATS :
32		The quality of ACE level 2 data is such that it is suitable for serious scientific study. However, to avoid confusion and misunderstanding, it is recommended that users consult with the appropriate ACE team members before publishing work derived from the data. The ACE team has worked hard to ensure that the level 2 data are free from errors, but the team cannot accept responsibility for erroneous data, or for misunderstandings about how the data may be used. This is especially true if the appropriate ACE team members are not consulted before publication. At the very least, preprints should be forwarded to the ACE team before publication.
33
34		# DATASET_ACKNOWLEDGEMENT :
35		Please acknowledge the ACE/MAG instrument team and the ACE Science Center
36
37		#
38		# PARAMETER_ID : imf
39		# PARAMETER_NAME : imf
40		# PARAMETER_SHORT_NAME : b_gse
41		# PARAMETER_COMPONENTS : bx,by,bz
42		# PARAMETER_UNITS : nT
43		# PARAMETER_COORDINATE_SYSTEM : GSE
44		# PARAMETER_TENSOR_ORDER : 0
45		# PARAMETER_SI_CONVERSION : 1e-9>T
46		# PARAMETER_TABLE : None
47		# PARAMETER_FILL_VALUE : nan
48		# PARAMETER_UCD : phys.magField
49		#
50		#
51		# ---------------
52		# INTERVAL INFO :
53		# ---------------
54		# INTERVAL_START : 2013-09-23T08:58:12.000
55		# INTERVAL_STOP : 2013-09-23T09:11:48.000
56		#
57		# ------
58		# DATA :
59		# ------
60		# DATA_COLUMNS : AMDA_TIME, imf[0]
61		#
	1	#Sampling Time : 60
	2	#Time Format : YYYY-MM-DDThh:mm:ss.mls
	3	#imf(0) - Type : Local Parameter @ CDPP/AMDA - Name : bx_gse - Units : nT - Size : 1 - Frame : GSE - Mission : ACE - Instrument : MFI - Dataset : mfi_final-prelim
62	4	2013-09-23T09:00:30.000 NaN
63	5	2013-09-23T09:01:30.000 -2.71850
64	6	2013-09-23T09:02:30.000 -2.52150 No newline at end of file

plugins/amda/tests-resources/TestAmdaResultParser/NaNX.txt +3 -61

		@@ -1,64 +1,6
1		# -----------
2		# AMDA INFO :
3		# -----------
4		# AMDA_ABOUT : Created by CDPP/AMDA(c)
5		# AMDA_VERSION : 3.5.0
6		# AMDA_ACKNOWLEDGEMENT : CDPP/AMDA Team
7		#
8		# --------------
9		# REQUEST INFO :
10		# --------------
11		# REQUEST_STRUCTURE : one-file-per-parameter-per-interval
12		# REQUEST_TIME_FORMAT : ISO 8601
13		# REQUEST_OUTPUT_PARAMS : imf
14		#
15		# -----------------
16		# BASE PARAMETERS :
17		# -----------------
18		#
19		# MISSION_ID : NONE
20		#
21		# INSTRUMENT_ID : NONE
22		#
23		# DATASET_ID : ace-imf-all
24		# DATASET_NAME : final / prelim
25		# DATASET_DESCRIPTION : Interplanetary Magnetic Field 16-sec Level2/PRELIM Data
26		# DATASET_SOURCE : CDPP/DDServer
27		# DATASET_GLOBAL_START : 1997-09-02T00:00:12.000
28		# DATASET_GLOBAL_STOP : 2017-09-16T23:59:57.000
29		# DATASET_MIN_SAMPLING : 16
30		# DATASET_MAX_SAMPLING : 16
31		# DATASET_CAVEATS :
32		The quality of ACE level 2 data is such that it is suitable for serious scientific study. However, to avoid confusion and misunderstanding, it is recommended that users consult with the appropriate ACE team members before publishing work derived from the data. The ACE team has worked hard to ensure that the level 2 data are free from errors, but the team cannot accept responsibility for erroneous data, or for misunderstandings about how the data may be used. This is especially true if the appropriate ACE team members are not consulted before publication. At the very least, preprints should be forwarded to the ACE team before publication.
33
34		# DATASET_ACKNOWLEDGEMENT :
35		Please acknowledge the ACE/MAG instrument team and the ACE Science Center
36
37		#
38		# PARAMETER_ID : imf
39		# PARAMETER_NAME : imf
40		# PARAMETER_SHORT_NAME : b_gse
41		# PARAMETER_COMPONENTS : bx,by,bz
42		# PARAMETER_UNITS : nT
43		# PARAMETER_COORDINATE_SYSTEM : GSE
44		# PARAMETER_TENSOR_ORDER : 0
45		# PARAMETER_SI_CONVERSION : 1e-9>T
46		# PARAMETER_TABLE : None
47		# PARAMETER_FILL_VALUE : nan
48		# PARAMETER_UCD : phys.magField
49		#
50		#
51		# ---------------
52		# INTERVAL INFO :
53		# ---------------
54		# INTERVAL_START : 2013-09-23T08:58:12.000
55		# INTERVAL_STOP : 2013-09-23T09:11:48.000
56		#
57		# ------
58		# DATA :
59		# ------
60		# DATA_COLUMNS : AMDA_TIME, imf[0]
61		#
	1	#Sampling Time : 60
	2	#Time Format : YYYY-MM-DDThh:mm:ss.mls
	3	#imf(0) - Type : Local Parameter @ CDPP/AMDA - Name : bx_gse - Units : nT - Size : 1 - Frame : GSE - Mission : ACE - Instrument : MFI - Dataset : mfi_final-prelim
62	4	NaN -3.01425
63	5	2013-09-23T09:01:30.000 -2.71850
64	6	2013-09-23T09:02:30.000 -2.52150 No newline at end of file

plugins/amda/tests-resources/TestAmdaResultParser/NoUnit.txt +2 -60

		@@ -1,60 +1,2
1		# -----------
2		# AMDA INFO :
3		# -----------
4		# AMDA_ABOUT : Created by CDPP/AMDA(c)
5		# AMDA_VERSION : 3.5.0
6		# AMDA_ACKNOWLEDGEMENT : CDPP/AMDA Team
7		#
8		# --------------
9		# REQUEST INFO :
10		# --------------
11		# REQUEST_STRUCTURE : one-file-per-parameter-per-interval
12		# REQUEST_TIME_FORMAT : ISO 8601
13		# REQUEST_OUTPUT_PARAMS : imf
14		#
15		# -----------------
16		# BASE PARAMETERS :
17		# -----------------
18		#
19		# MISSION_ID : NONE
20		#
21		# INSTRUMENT_ID : NONE
22		#
23		# DATASET_ID : ace-imf-all
24		# DATASET_NAME : final / prelim
25		# DATASET_DESCRIPTION : Interplanetary Magnetic Field 16-sec Level2/PRELIM Data
26		# DATASET_SOURCE : CDPP/DDServer
27		# DATASET_GLOBAL_START : 1997-09-02T00:00:12.000
28		# DATASET_GLOBAL_STOP : 2017-09-16T23:59:57.000
29		# DATASET_MIN_SAMPLING : 16
30		# DATASET_MAX_SAMPLING : 16
31		# DATASET_CAVEATS :
32		The quality of ACE level 2 data is such that it is suitable for serious scientific study. However, to avoid confusion and misunderstanding, it is recommended that users consult with the appropriate ACE team members before publishing work derived from the data. The ACE team has worked hard to ensure that the level 2 data are free from errors, but the team cannot accept responsibility for erroneous data, or for misunderstandings about how the data may be used. This is especially true if the appropriate ACE team members are not consulted before publication. At the very least, preprints should be forwarded to the ACE team before publication.
33
34		# DATASET_ACKNOWLEDGEMENT :
35		Please acknowledge the ACE/MAG instrument team and the ACE Science Center
36
37		#
38		# PARAMETER_ID : imf
39		# PARAMETER_NAME : imf
40		# PARAMETER_SHORT_NAME : b_gse
41		# PARAMETER_COMPONENTS : bx,by,bz
42		# PARAMETER_COORDINATE_SYSTEM : GSE
43		# PARAMETER_TENSOR_ORDER : 0
44		# PARAMETER_SI_CONVERSION : 1e-9>T
45		# PARAMETER_TABLE : None
46		# PARAMETER_FILL_VALUE : nan
47		# PARAMETER_UCD : phys.magField
48		#
49		#
50		# ---------------
51		# INTERVAL INFO :
52		# ---------------
53		# INTERVAL_START : 2013-09-23T08:58:12.000
54		# INTERVAL_STOP : 2013-09-23T09:11:48.000
55		#
56		# ------
57		# DATA :
58		# ------
59		# DATA_COLUMNS : AMDA_TIME, imf[0]
60		# No newline at end of file
	1	#Sampling Time : 60
	2	#Time Format : YYYY-MM-DDThh:mm:ss.mls No newline at end of file

plugins/amda/tests-resources/TestAmdaResultParser/TooManyValues.txt +3 -61

		@@ -1,64 +1,6
1		# -----------
2		# AMDA INFO :
3		# -----------
4		# AMDA_ABOUT : Created by CDPP/AMDA(c)
5		# AMDA_VERSION : 3.5.0
6		# AMDA_ACKNOWLEDGEMENT : CDPP/AMDA Team
7		#
8		# --------------
9		# REQUEST INFO :
10		# --------------
11		# REQUEST_STRUCTURE : one-file-per-parameter-per-interval
12		# REQUEST_TIME_FORMAT : ISO 8601
13		# REQUEST_OUTPUT_PARAMS : imf
14		#
15		# -----------------
16		# BASE PARAMETERS :
17		# -----------------
18		#
19		# MISSION_ID : NONE
20		#
21		# INSTRUMENT_ID : NONE
22		#
23		# DATASET_ID : ace-imf-all
24		# DATASET_NAME : final / prelim
25		# DATASET_DESCRIPTION : Interplanetary Magnetic Field 16-sec Level2/PRELIM Data
26		# DATASET_SOURCE : CDPP/DDServer
27		# DATASET_GLOBAL_START : 1997-09-02T00:00:12.000
28		# DATASET_GLOBAL_STOP : 2017-09-16T23:59:57.000
29		# DATASET_MIN_SAMPLING : 16
30		# DATASET_MAX_SAMPLING : 16
31		# DATASET_CAVEATS :
32		The quality of ACE level 2 data is such that it is suitable for serious scientific study. However, to avoid confusion and misunderstanding, it is recommended that users consult with the appropriate ACE team members before publishing work derived from the data. The ACE team has worked hard to ensure that the level 2 data are free from errors, but the team cannot accept responsibility for erroneous data, or for misunderstandings about how the data may be used. This is especially true if the appropriate ACE team members are not consulted before publication. At the very least, preprints should be forwarded to the ACE team before publication.
33
34		# DATASET_ACKNOWLEDGEMENT :
35		Please acknowledge the ACE/MAG instrument team and the ACE Science Center
36
37		#
38		# PARAMETER_ID : imf
39		# PARAMETER_NAME : imf
40		# PARAMETER_SHORT_NAME : b_gse
41		# PARAMETER_COMPONENTS : bx,by,bz
42		# PARAMETER_UNITS : nT
43		# PARAMETER_COORDINATE_SYSTEM : GSE
44		# PARAMETER_TENSOR_ORDER : 0
45		# PARAMETER_SI_CONVERSION : 1e-9>T
46		# PARAMETER_TABLE : None
47		# PARAMETER_FILL_VALUE : nan
48		# PARAMETER_UCD : phys.magField
49		#
50		#
51		# ---------------
52		# INTERVAL INFO :
53		# ---------------
54		# INTERVAL_START : 2013-09-23T08:58:12.000
55		# INTERVAL_STOP : 2013-09-23T09:11:48.000
56		#
57		# ------
58		# DATA :
59		# ------
60		# DATA_COLUMNS : AMDA_TIME, imf[0]
61		#
	1	#Sampling Time : 60
	2	#Time Format : YYYY-MM-DDThh:mm:ss.mls
	3	#imf(0) - Type : Local Parameter @ CDPP/AMDA - Name : bx_gse - Units : nT - Size : 1 - Frame : GSE - Mission : ACE - Instrument : MFI - Dataset : mfi_final-prelim
62	4	2013-09-23T09:00:30.000 -2.83950 1.05141 3.01547
63	5	2013-09-23T09:01:30.000 -2.71850
64	6	2013-09-23T09:02:30.000 -2.52150 No newline at end of file

plugins/amda/tests-resources/TestAmdaResultParser/ValidScalar1.txt +3 -61

		@@ -1,64 +1,6
1		# -----------
2		# AMDA INFO :
3		# -----------
4		# AMDA_ABOUT : Created by CDPP/AMDA(c)
5		# AMDA_VERSION : 3.5.0
6		# AMDA_ACKNOWLEDGEMENT : CDPP/AMDA Team
7		#
8		# --------------
9		# REQUEST INFO :
10		# --------------
11		# REQUEST_STRUCTURE : one-file-per-parameter-per-interval
12		# REQUEST_TIME_FORMAT : ISO 8601
13		# REQUEST_OUTPUT_PARAMS : imf
14		#
15		# -----------------
16		# BASE PARAMETERS :
17		# -----------------
18		#
19		# MISSION_ID : NONE
20		#
21		# INSTRUMENT_ID : NONE
22		#
23		# DATASET_ID : ace-imf-all
24		# DATASET_NAME : final / prelim
25		# DATASET_DESCRIPTION : Interplanetary Magnetic Field 16-sec Level2/PRELIM Data
26		# DATASET_SOURCE : CDPP/DDServer
27		# DATASET_GLOBAL_START : 1997-09-02T00:00:12.000
28		# DATASET_GLOBAL_STOP : 2017-09-16T23:59:57.000
29		# DATASET_MIN_SAMPLING : 16
30		# DATASET_MAX_SAMPLING : 16
31		# DATASET_CAVEATS :
32		The quality of ACE level 2 data is such that it is suitable for serious scientific study. However, to avoid confusion and misunderstanding, it is recommended that users consult with the appropriate ACE team members before publishing work derived from the data. The ACE team has worked hard to ensure that the level 2 data are free from errors, but the team cannot accept responsibility for erroneous data, or for misunderstandings about how the data may be used. This is especially true if the appropriate ACE team members are not consulted before publication. At the very least, preprints should be forwarded to the ACE team before publication.
33
34		# DATASET_ACKNOWLEDGEMENT :
35		Please acknowledge the ACE/MAG instrument team and the ACE Science Center
36
37		#
38		# PARAMETER_ID : imf
39		# PARAMETER_NAME : imf
40		# PARAMETER_SHORT_NAME : b_gse
41		# PARAMETER_COMPONENTS : bx,by,bz
42		# PARAMETER_UNITS : nT
43		# PARAMETER_COORDINATE_SYSTEM : GSE
44		# PARAMETER_TENSOR_ORDER : 0
45		# PARAMETER_SI_CONVERSION : 1e-9>T
46		# PARAMETER_TABLE : None
47		# PARAMETER_FILL_VALUE : nan
48		# PARAMETER_UCD : phys.magField
49		#
50		#
51		# ---------------
52		# INTERVAL INFO :
53		# ---------------
54		# INTERVAL_START : 2013-09-23T08:58:12.000
55		# INTERVAL_STOP : 2013-09-23T09:11:48.000
56		#
57		# ------
58		# DATA :
59		# ------
60		# DATA_COLUMNS : AMDA_TIME, imf[0]
61		#
	1	#Sampling Time : 60
	2	#Time Format : YYYY-MM-DDThh:mm:ss.mls
	3	#imf(0) - Type : Local Parameter @ CDPP/AMDA - Name : bx_gse - Units : nT - Size : 1 - Frame : GSE - Mission : ACE - Instrument : MFI - Dataset : mfi_final-prelim
62	4	2013-09-23T09:00:30.000 -2.83950
63	5	2013-09-23T09:01:30.000 -2.71850
64	6	2013-09-23T09:02:30.000 -2.52150

plugins/amda/tests-resources/TestAmdaResultParser/ValidVector1.txt +2 -61

		@@ -1,64 +1,5
1		# -----------
2		# AMDA INFO :
3		# -----------
4		# AMDA_ABOUT : Created by CDPP/AMDA(c)
5		# AMDA_VERSION : 3.5.0
6		# AMDA_ACKNOWLEDGEMENT : CDPP/AMDA Team
7		#
8		# --------------
9		# REQUEST INFO :
10		# --------------
11		# REQUEST_STRUCTURE : one-file-per-parameter-per-interval
12		# REQUEST_TIME_FORMAT : ISO 8601
13		# REQUEST_OUTPUT_PARAMS : imf
14		#
15		# -----------------
16		# BASE PARAMETERS :
17		# -----------------
18		#
19		# MISSION_ID : NONE
20		#
21		# INSTRUMENT_ID : NONE
22		#
23		# DATASET_ID : ace-imf-all
24		# DATASET_NAME : final / prelim
25		# DATASET_DESCRIPTION : Interplanetary Magnetic Field 16-sec Level2/PRELIM Data
26		# DATASET_SOURCE : CDPP/DDServer
27		# DATASET_GLOBAL_START : 1997-09-02T00:00:12.000
28		# DATASET_GLOBAL_STOP : 2017-09-16T23:59:57.000
29		# DATASET_MIN_SAMPLING : 16
30		# DATASET_MAX_SAMPLING : 16
31		# DATASET_CAVEATS :
32		The quality of ACE level 2 data is such that it is suitable for serious scientific study. However, to avoid confusion and misunderstanding, it is recommended that users consult with the appropriate ACE team members before publishing work derived from the data. The ACE team has worked hard to ensure that the level 2 data are free from errors, but the team cannot accept responsibility for erroneous data, or for misunderstandings about how the data may be used. This is especially true if the appropriate ACE team members are not consulted before publication. At the very least, preprints should be forwarded to the ACE team before publication.
33
34		# DATASET_ACKNOWLEDGEMENT :
35		Please acknowledge the ACE/MAG instrument team and the ACE Science Center
36
37		#
38		# PARAMETER_ID : imf
39		# PARAMETER_NAME : imf
40		# PARAMETER_SHORT_NAME : b_gse
41		# PARAMETER_COMPONENTS : bx,by,bz
42		# PARAMETER_UNITS : nT
43		# PARAMETER_COORDINATE_SYSTEM : GSE
44		# PARAMETER_TENSOR_ORDER : 0
45		# PARAMETER_SI_CONVERSION : 1e-9>T
46		# PARAMETER_TABLE : None
47		# PARAMETER_FILL_VALUE : nan
48		# PARAMETER_UCD : phys.magField
49		#
50		#
51		# ---------------
52		# INTERVAL INFO :
53		# ---------------
54		# INTERVAL_START : 2012-09-27T06:47:56.000
55		# INTERVAL_STOP : 2012-09-27T08:09:32.000
56		#
57		# ------
58		# DATA :
59		# ------
60		# DATA_COLUMNS : AMDA_TIME, imf[0], imf[1], imf[2]
61		#
	1	#Time Format : YYYY-MM-DDThh:mm:ss.mls
	2	#imf - Type : Local Parameter @ CDPP/AMDA - Name : imf_gse - Units : nT - Size : 3 - Frame : GSE - Mission : ACE - Instrument : MFI - Dataset : mfi_final-prelim
62	3	2013-07-02T09:13:50.000 -0.332000 3.20600 0.0580000
63	4	2013-07-02T09:14:06.000 -1.01100 2.99900 0.496000
64	5	2013-07-02T09:14:22.000 -1.45700 2.78500 1.01800

plugins/amda/tests-resources/TestAmdaResultParser/WrongDate.txt +3 -61

		@@ -1,64 +1,6
1		# -----------
2		# AMDA INFO :
3		# -----------
4		# AMDA_ABOUT : Created by CDPP/AMDA(c)
5		# AMDA_VERSION : 3.5.0
6		# AMDA_ACKNOWLEDGEMENT : CDPP/AMDA Team
7		#
8		# --------------
9		# REQUEST INFO :
10		# --------------
11		# REQUEST_STRUCTURE : one-file-per-parameter-per-interval
12		# REQUEST_TIME_FORMAT : ISO 8601
13		# REQUEST_OUTPUT_PARAMS : imf
14		#
15		# -----------------
16		# BASE PARAMETERS :
17		# -----------------
18		#
19		# MISSION_ID : NONE
20		#
21		# INSTRUMENT_ID : NONE
22		#
23		# DATASET_ID : ace-imf-all
24		# DATASET_NAME : final / prelim
25		# DATASET_DESCRIPTION : Interplanetary Magnetic Field 16-sec Level2/PRELIM Data
26		# DATASET_SOURCE : CDPP/DDServer
27		# DATASET_GLOBAL_START : 1997-09-02T00:00:12.000
28		# DATASET_GLOBAL_STOP : 2017-09-16T23:59:57.000
29		# DATASET_MIN_SAMPLING : 16
30		# DATASET_MAX_SAMPLING : 16
31		# DATASET_CAVEATS :
32		The quality of ACE level 2 data is such that it is suitable for serious scientific study. However, to avoid confusion and misunderstanding, it is recommended that users consult with the appropriate ACE team members before publishing work derived from the data. The ACE team has worked hard to ensure that the level 2 data are free from errors, but the team cannot accept responsibility for erroneous data, or for misunderstandings about how the data may be used. This is especially true if the appropriate ACE team members are not consulted before publication. At the very least, preprints should be forwarded to the ACE team before publication.
33
34		# DATASET_ACKNOWLEDGEMENT :
35		Please acknowledge the ACE/MAG instrument team and the ACE Science Center
36
37		#
38		# PARAMETER_ID : imf
39		# PARAMETER_NAME : imf
40		# PARAMETER_SHORT_NAME : b_gse
41		# PARAMETER_COMPONENTS : bx,by,bz
42		# PARAMETER_UNITS : nT
43		# PARAMETER_COORDINATE_SYSTEM : GSE
44		# PARAMETER_TENSOR_ORDER : 0
45		# PARAMETER_SI_CONVERSION : 1e-9>T
46		# PARAMETER_TABLE : None
47		# PARAMETER_FILL_VALUE : nan
48		# PARAMETER_UCD : phys.magField
49		#
50		#
51		# ---------------
52		# INTERVAL INFO :
53		# ---------------
54		# INTERVAL_START : 2013-09-23T08:58:12.000
55		# INTERVAL_STOP : 2013-09-23T09:11:48.000
56		#
57		# ------
58		# DATA :
59		# ------
60		# DATA_COLUMNS : AMDA_TIME, imf[0]
61		#
	1	#Sampling Time : 60
	2	#Time Format : YYYY-MM-DDThh:mm:ss.mls
	3	#imf(0) - Type : Local Parameter @ CDPP/AMDA - Name : bx_gse - Units : nT - Size : 1 - Frame : GSE - Mission : ACE - Instrument : MFI - Dataset : mfi_final-prelim
62	4	23/09/2013 07:50:30 -2.83950
63	5	2013-09-23T09:01:30.000 -2.71850
64	6	2013-09-23T09:02:30.000 -2.52150 No newline at end of file

plugins/amda/tests-resources/TestAmdaResultParser/WrongUnit.txt +3 -61

		@@ -1,64 +1,6
1		# -----------
2		# AMDA INFO :
3		# -----------
4		# AMDA_ABOUT : Created by CDPP/AMDA(c)
5		# AMDA_VERSION : 3.5.0
6		# AMDA_ACKNOWLEDGEMENT : CDPP/AMDA Team
7		#
8		# --------------
9		# REQUEST INFO :
10		# --------------
11		# REQUEST_STRUCTURE : one-file-per-parameter-per-interval
12		# REQUEST_TIME_FORMAT : ISO 8601
13		# REQUEST_OUTPUT_PARAMS : imf
14		#
15		# -----------------
16		# BASE PARAMETERS :
17		# -----------------
18		#
19		# MISSION_ID : NONE
20		#
21		# INSTRUMENT_ID : NONE
22		#
23		# DATASET_ID : ace-imf-all
24		# DATASET_NAME : final / prelim
25		# DATASET_DESCRIPTION : Interplanetary Magnetic Field 16-sec Level2/PRELIM Data
26		# DATASET_SOURCE : CDPP/DDServer
27		# DATASET_GLOBAL_START : 1997-09-02T00:00:12.000
28		# DATASET_GLOBAL_STOP : 2017-09-16T23:59:57.000
29		# DATASET_MIN_SAMPLING : 16
30		# DATASET_MAX_SAMPLING : 16
31		# DATASET_CAVEATS :
32		The quality of ACE level 2 data is such that it is suitable for serious scientific study. However, to avoid confusion and misunderstanding, it is recommended that users consult with the appropriate ACE team members before publishing work derived from the data. The ACE team has worked hard to ensure that the level 2 data are free from errors, but the team cannot accept responsibility for erroneous data, or for misunderstandings about how the data may be used. This is especially true if the appropriate ACE team members are not consulted before publication. At the very least, preprints should be forwarded to the ACE team before publication.
33
34		# DATASET_ACKNOWLEDGEMENT :
35		Please acknowledge the ACE/MAG instrument team and the ACE Science Center
36
37		#
38		# PARAMETER_ID : imf
39		# PARAMETER_NAME : imf
40		# PARAMETER_SHORT_NAME : b_gse
41		# PARAMETER_COMPONENTS : bx,by,bz
42		# PARAM_UNITS : wrong unit line
43		# PARAMETER_COORDINATE_SYSTEM : GSE
44		# PARAMETER_TENSOR_ORDER : 0
45		# PARAMETER_SI_CONVERSION : 1e-9>T
46		# PARAMETER_TABLE : None
47		# PARAMETER_FILL_VALUE : nan
48		# PARAMETER_UCD : phys.magField
49		#
50		#
51		# ---------------
52		# INTERVAL INFO :
53		# ---------------
54		# INTERVAL_START : 2013-09-23T08:58:12.000
55		# INTERVAL_STOP : 2013-09-23T09:11:48.000
56		#
57		# ------
58		# DATA :
59		# ------
60		# DATA_COLUMNS : AMDA_TIME, imf[0]
61		#
	1	#Sampling Time : 60
	2	#Time Format : YYYY-MM-DDThh:mm:ss.mls
	3	#Wrong unit comment
62	4	2013-09-23T09:00:30.000 -2.83950
63	5	2013-09-23T09:01:30.000 -2.71850
64	6	2013-09-23T09:02:30.000 -2.52150 No newline at end of file

plugins/amda/tests-resources/TestAmdaResultParser/WrongValue.txt +3 -61

		@@ -1,64 +1,6
1		# -----------
2		# AMDA INFO :
3		# -----------
4		# AMDA_ABOUT : Created by CDPP/AMDA(c)
5		# AMDA_VERSION : 3.5.0
6		# AMDA_ACKNOWLEDGEMENT : CDPP/AMDA Team
7		#
8		# --------------
9		# REQUEST INFO :
10		# --------------
11		# REQUEST_STRUCTURE : one-file-per-parameter-per-interval
12		# REQUEST_TIME_FORMAT : ISO 8601
13		# REQUEST_OUTPUT_PARAMS : imf
14		#
15		# -----------------
16		# BASE PARAMETERS :
17		# -----------------
18		#
19		# MISSION_ID : NONE
20		#
21		# INSTRUMENT_ID : NONE
22		#
23		# DATASET_ID : ace-imf-all
24		# DATASET_NAME : final / prelim
25		# DATASET_DESCRIPTION : Interplanetary Magnetic Field 16-sec Level2/PRELIM Data
26		# DATASET_SOURCE : CDPP/DDServer
27		# DATASET_GLOBAL_START : 1997-09-02T00:00:12.000
28		# DATASET_GLOBAL_STOP : 2017-09-16T23:59:57.000
29		# DATASET_MIN_SAMPLING : 16
30		# DATASET_MAX_SAMPLING : 16
31		# DATASET_CAVEATS :
32		The quality of ACE level 2 data is such that it is suitable for serious scientific study. However, to avoid confusion and misunderstanding, it is recommended that users consult with the appropriate ACE team members before publishing work derived from the data. The ACE team has worked hard to ensure that the level 2 data are free from errors, but the team cannot accept responsibility for erroneous data, or for misunderstandings about how the data may be used. This is especially true if the appropriate ACE team members are not consulted before publication. At the very least, preprints should be forwarded to the ACE team before publication.
33
34		# DATASET_ACKNOWLEDGEMENT :
35		Please acknowledge the ACE/MAG instrument team and the ACE Science Center
36
37		#
38		# PARAMETER_ID : imf
39		# PARAMETER_NAME : imf
40		# PARAMETER_SHORT_NAME : b_gse
41		# PARAMETER_COMPONENTS : bx,by,bz
42		# PARAMETER_UNITS : nT
43		# PARAMETER_COORDINATE_SYSTEM : GSE
44		# PARAMETER_TENSOR_ORDER : 0
45		# PARAMETER_SI_CONVERSION : 1e-9>T
46		# PARAMETER_TABLE : None
47		# PARAMETER_FILL_VALUE : nan
48		# PARAMETER_UCD : phys.magField
49		#
50		#
51		# ---------------
52		# INTERVAL INFO :
53		# ---------------
54		# INTERVAL_START : 2013-09-23T08:58:12.000
55		# INTERVAL_STOP : 2013-09-23T09:11:48.000
56		#
57		# ------
58		# DATA :
59		# ------
60		# DATA_COLUMNS : AMDA_TIME, imf[0]
61		#
	1	#Sampling Time : 60
	2	#Time Format : YYYY-MM-DDThh:mm:ss.mls
	3	#imf(0) - Type : Local Parameter @ CDPP/AMDA - Name : bx_gse - Units : nT - Size : 1 - Frame : GSE - Mission : ACE - Instrument : MFI - Dataset : mfi_final-prelim
62	4	2013-09-23T09:00:30.000 abc
63	5	2013-09-23T09:01:30.000 -2.71850
64	6	2013-09-23T09:02:30.000 -2.52150 No newline at end of file

plugins/amda/tests/TestAmdaAcquisition.cpp +2 -4

              void TestAmdaAcquisition::testAcquisition()
              {
-                 /// @todo: update test to be compatible with AMDA v2
                  // READ the ref file:
                  auto filePath = QFileInfo{TESTS_RESOURCES_PATH, TESTS_AMDA_REF_FILE}.absoluteFilePath();
                  auto results = AmdaResultParser::readTxt(filePath, AmdaResultParser::ValueType::SCALAR);
                  // 2 : pan (jump) left for one hour
                  auto nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 1, 0, 0}};
                  auto nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 2, 0, 0}};
-                 // requestDataLoading(nextVarRS, nextVarRE);
+                 requestDataLoading(nextVarRS, nextVarRE);
                  // 3 : pan (jump) right for one hour
                  nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 5, 0, 0}};
                  nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 6, 0, 0}};
-                 // requestDataLoading(nextVarRS, nextVarRE);
+                 requestDataLoading(nextVarRS, nextVarRE);
                  // 4 : pan (overlay) right for 30 min
                  nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 5, 30, 0}};

core/include/Variable/VariableCacheStrategyFactory.h removed 0 -44

NO CONTENT: file was removed

core/include/Variable/VariableSingleThresholdCacheStrategy.h removed 0 -32

NO CONTENT: file was removed

core/tests/Variable/TestVariableSync.cpp removed 0 -310

NO CONTENT: file was removed

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/FileNotFound.txt removed 0 -3

NO CONTENT: file was removed

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/NaNValue.txt removed 0 -6

NO CONTENT: file was removed

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/NaNX.txt removed 0 -6

NO CONTENT: file was removed

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/NoUnit.txt removed 0 -2

NO CONTENT: file was removed

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/TooManyValues.txt removed 0 -6

NO CONTENT: file was removed

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/ValidScalar1.txt removed 0 -13

NO CONTENT: file was removed

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/ValidVector1.txt removed 0 -12

NO CONTENT: file was removed

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/WrongDate.txt removed 0 -6

NO CONTENT: file was removed

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/WrongUnit.txt removed 0 -6

NO CONTENT: file was removed

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/WrongValue.txt removed 0 -6

NO CONTENT: file was removed

General Comments 2

there is 1 general comment from older versions, show it

perrinel

v2 |

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 2 added
  * 0 removed

Changed files:
  * A core/include/Variable/VariableAcquisitionWorker.h
  * M core/include/Data/IDataProvider.h
  * M core/include/Variable/VariableController.h
  * M core/src/Network/NetworkController.cpp
  * M core/src/Variable/VariableAcquisitionWorker.cpp
  * M core/src/Variable/VariableController.cpp
  * M plugins/amda/src/AmdaProvider.cpp

No TODOs yet

		Pull request updated. Auto status change to \|under_review\|...
`v1 Thu, 21 Sep 2017 18:05:07`
		Auto status change to \|new_status\|...

In pull request description:

No Ticket data found.

In commit messages:

No Ticket data found.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages