p61743098
/
sagecal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #47 from tammojan/casacore2 

Update namespace and include path for casacore >= 2.0
This commit is contained in:
SarodYatawatta 2018-03-13 12:10:51 +01:00 committed by GitHub
parent 3f25c7987b 0dbab64b3d
commit 1c1d60606f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/MS/data.cpp
View File

@ -20,17 +20,17 @@
#include "data.h"
#include "Radio.h"
#include "Dirac.h"
#include <measures/Measures/MDirection.h>
#include <measures/Measures/UVWMachine.h>
#include <casa/Quanta.h>
#include <casa/Quanta/Quantum.h>
#include <casacore/measures/Measures/MDirection.h>
#include <casacore/measures/Measures/UVWMachine.h>
#include <casacore/casa/Quanta.h>
#include <casacore/casa/Quanta/Quantum.h>
/* speed of light */
#ifndef CONST_C
#define CONST_C 299792458.0
#endif
using namespace casa;
using namespace casacore;
int Data::numChannels=1;
unsigned long int Data::numRows;

26
src/MS/data.h
View File

@ -22,22 +22,22 @@
#include <unistd.h>
#include <stdio.h>
#include <iostream>
#include <ms/MeasurementSets/MSIter.h>
#include <tables/Tables/Table.h>
#include <tables/Tables/TableVector.h>
#include <tables/Tables/TableRecord.h>
#include <tables/Tables/TableColumn.h>
#include <tables/Tables/TableIter.h>
#include <tables/Tables/ScalarColumn.h>
#include <tables/Tables/ArrayColumn.h>
#include <casa/Arrays/Array.h>
#include <casa/Arrays/Cube.h>
#include <casacore/ms/MeasurementSets/MSIter.h>
#include <casacore/tables/Tables/Table.h>
#include <casacore/tables/Tables/TableVector.h>
#include <casacore/tables/Tables/TableRecord.h>
#include <casacore/tables/Tables/TableColumn.h>
#include <casacore/tables/Tables/TableIter.h>
#include <casacore/tables/Tables/ScalarColumn.h>
#include <casacore/tables/Tables/ArrayColumn.h>
#include <casacore/casa/Arrays/Array.h>
#include <casacore/casa/Arrays/Cube.h>
#include <fstream>
#include <math.h>
#include <complex>
using namespace casa;
using namespace casacore;
namespace Data
{
@ -121,8 +121,8 @@ namespace Data
extern float min_uvcut;
extern float max_uvcut;
extern float max_uvtaper;
extern casa::String DataField; /* input column DATA/CORRECTED_DATA */
extern casa::String OutField; /* output column DATA/CORRECTED_DATA */
extern casacore::String DataField; /* input column DATA/CORRECTED_DATA */
extern casacore::String OutField; /* output column DATA/CORRECTED_DATA */
extern int TileSize; //Tile size
extern int Nt; /* no of worker threads */
extern char *SkyModel; /* sky model file */