makefile: fix some paths/dependencies and setup + gitignore
This commit is contained in:
parent
2772515dea
commit
2dcd67c194
4
.gitignore
vendored
Normal file
4
.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
|
||||||
|
/build
|
||||||
|
|
||||||
|
*.csv
|
Binary file not shown.
Binary file not shown.
12
makefile
12
makefile
@ -40,13 +40,15 @@ uninstall :
|
|||||||
rm /usr/local/bin/$(EXE)
|
rm /usr/local/bin/$(EXE)
|
||||||
|
|
||||||
# build python module
|
# build python module
|
||||||
build : setup.py raw_eater.pyx raw_eater.pxd $(SRC)raweat.hpp
|
build : setup.py raw_eater.pyx raw_eater.pxd $(LIB)raweat.hpp
|
||||||
python3 setup.py build_ext --inplace
|
python3 setup.py build_ext --inplace
|
||||||
|
cp raw_eater.cpython-*.so pyt/
|
||||||
|
|
||||||
install_py : setup.py raw_eater.pyx raw_eater.pxd $(SRC)raweat.hpp
|
py_install: setup.py raw_eater.pyx raw_eater.pxd $(LIB)raweat.hpp
|
||||||
python3 setup.py install
|
python3 setup.py install
|
||||||
|
|
||||||
clean_py :
|
py_clean :
|
||||||
rm -f raw_eater.cpython-36m-x86_64-linux-gnu.so
|
rm -f raw_eater.cpython-*.so
|
||||||
|
rm -f pyt/raw_eater.cpython-*.so
|
||||||
rm -f raw_eater.cpp
|
rm -f raw_eater.cpp
|
||||||
|
rm -rf build/
|
||||||
|
@ -11,7 +11,7 @@ from libcpp cimport bool
|
|||||||
|
|
||||||
# these method names have to match the C definitions of the methods!!
|
# these method names have to match the C definitions of the methods!!
|
||||||
|
|
||||||
cdef extern from "raweat.hpp":
|
cdef extern from "lib/raweat.hpp":
|
||||||
cdef cppclass raw_eater:
|
cdef cppclass raw_eater:
|
||||||
raw_eater(string) except +
|
raw_eater(string) except +
|
||||||
# get channel name and unit
|
# get channel name and unit
|
||||||
|
@ -11,18 +11,18 @@ int main(int argc, char* argv[])
|
|||||||
std::cout<<"number of CLI-arguments: "<<argc<<"\n";
|
std::cout<<"number of CLI-arguments: "<<argc<<"\n";
|
||||||
for ( int i = 0; i < argc; i++ ) std::cout<<std::setw(5)<<i<<": "<<argv[i]<<"\n";
|
for ( int i = 0; i < argc; i++ ) std::cout<<std::setw(5)<<i<<": "<<argv[i]<<"\n";
|
||||||
|
|
||||||
// check number of CLI arguments
|
|
||||||
assert( argc >= 3 );
|
|
||||||
|
|
||||||
// provide --help like return statement
|
// provide --help like return statement
|
||||||
if ( argc < 3 )
|
if ( argc < 3 )
|
||||||
{
|
{
|
||||||
std::cout<<"\n"<<"Usage: ./eatit INPUTRAW_1 INPUTRAW_2 ...INPUTRAW_N OUTPUTFILE"<<"\n"
|
std::cout<<"\n"<<"Usage: ./eatit INPUTRAW_1 INPUTRAW_2 ...INPUTRAW_N OUTPUTFILE"<<"\n"
|
||||||
<<"Convert set of related files in imc-format .raw corresponding to same measurement to single plain text .csv"<<"\n"
|
<<"Convert set of related files in imc-format .raw originating from same measurement to single plain text .csv"<<"\n"
|
||||||
<<"Example: ./eatit Druck_THZ_DK.raw pressure_Vacuum.raw druck_thz_dk.csv"<<"\n\n";
|
<<"Example: ./eatit Druck_THZ_DK.raw pressure_Vacuum.raw druck_thz_dk.csv"<<"\n\n";
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check number of CLI arguments
|
||||||
|
assert( argc >= 3 );
|
||||||
|
|
||||||
// get list of names/paths of raw-files from CLI argument
|
// get list of names/paths of raw-files from CLI argument
|
||||||
std::vector<std::string> rawfiles;
|
std::vector<std::string> rawfiles;
|
||||||
for (int i = 1; i < argc-1; i++ ) rawfiles.push_back(std::string(argv[i]));
|
for (int i = 1; i < argc-1; i++ ) rawfiles.push_back(std::string(argv[i]));
|
||||||
@ -66,6 +66,7 @@ int main(int argc, char* argv[])
|
|||||||
std::vector<std::string> channinfo = {eatraw.get_name(),eatraw.get_unit(),eatraw.get_temp_unit()};
|
std::vector<std::string> channinfo = {eatraw.get_name(),eatraw.get_unit(),eatraw.get_temp_unit()};
|
||||||
channelinfo.push_back(channinfo);
|
channelinfo.push_back(channinfo);
|
||||||
}
|
}
|
||||||
|
std::cout<<"\n";
|
||||||
|
|
||||||
// obtain number of channels
|
// obtain number of channels
|
||||||
int num_chann = (int)alldata.size();
|
int num_chann = (int)alldata.size();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user