CDPP / AMDA_Kernel

Commit 03e8f845422050f632ffc143b87a76bf5c0e9073

Authored by Benjamin Renard
1 parent b1237005
Exists in master and in 98 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SolarOrbiter, SpeasyGet, akka-centos7, akka-scatter-multi-xparams, amdadev, amdadev_test, centos7, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Instanciate netCDF file reader in LocalFileInterface

Showing 3 changed files with 10 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/ParamGetImpl/LocalFileInterface/VirtualInstrument.cc
  Diff comments   View file @03e8f84
... ... @@ -16,6 +16,7 @@
16 16 #include "FileReaderCDF.hh"
17 17 #include "FileReaderASCII.hh"
18 18 #include "FileReaderVOTable.hh"
  19 +#include "FileReaderNetCDF.hh"
19 20  
20 21 #include <boost/filesystem/path.hpp>
21 22 #include <boost/filesystem.hpp>
... ... @@ -74,6 +75,11 @@ bool VirtualInstrument::createFileReader(LocalTimeFormat timeFormat)
74 75 _fileReaderPtr = new FileReaderVOTable();
75 76 LOG4CXX_INFO(gLogger, "VirtualInstrument::createFileReader - VOTable Reader created");
76 77 break;
  78 + case VIFileFormat::FORMAT_NETCDF :
  79 + //netCDF file format
  80 + _fileReaderPtr = new FileReaderNetCDF();
  81 + LOG4CXX_INFO(gLogger, "VirtualInstrument::createFileReader - netCDF Reader created");
  82 + break;
77 83 default:
78 84 LOG4CXX_ERROR(gLogger, "VirtualInstrument::createFileReader - Reader not implemented");
79 85 }
... ...
src/ParamGetImpl/LocalFileInterface/VirtualInstrument.hh
  Diff comments   View file @03e8f84
... ... @@ -41,7 +41,8 @@ typedef enum
41 41 FORMAT_UNKNOWN,
42 42 FORMAT_ASCII,
43 43 FORMAT_CDF,
44   - FORMAT_VOT
  44 + FORMAT_VOT,
  45 + FORMAT_NETCDF
45 46 } VIFileFormat;
46 47  
47 48 /*
... ...
src/ParamGetImpl/LocalFileInterface/VirtualInstrumentBaseParser.cc
  Diff comments   View file @03e8f84
... ... @@ -115,6 +115,8 @@ public:
115 115 lVI->setFilesFormat(VIFileFormat::FORMAT_CDF);
116 116 else if (loadedVIFormat == "VOT")
117 117 lVI->setFilesFormat(VIFileFormat::FORMAT_VOT);
  118 + else if (loadedVIFormat == "NETCDF")
  119 + lVI->setFilesFormat(VIFileFormat::FORMAT_NETCDF);
118 120 else
119 121 {
120 122 ERROR_EXCEPTION("Unknown format " << loadedVIFormat)
... ...