Commit 22924b39 authored by Robert Butora's avatar Robert Butora
Browse files

cutout: adds preliminary imcopydav and removes unused temp_dir param from imcopy

parent f9e83565

data-access/engine/src/vlkb/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -11,10 +11,11 @@ DEPS_INC := $(foreach d, $(DEPS_DIR), $d/include) 
DEPS_LIB := $(foreach d, $(DEPS_DIR), $d/lib)

#================================================================================

INC_DIR = $(DEPS_INC) \

	  /usr/include/davix \

	  /usr/include/cfitsio \

	  /usr/local/include \

	  /usr/local/cfitsio/include

LIB_DIR = $(DEPS_LIB) \

	  /usr/lib64/ast \

	  /usr/local/lib \

	  /usr/local/cfitsio/lib

#================================================================================
@@ -27,7 +28,7 @@ CFLAGS_COMMON = -c -Wstrict-prototypes $(FLAGS_COMMON) 
CXX_DEBUG_FLAGS   = -g -DVERBOSE_DEBUG -DFDB_DEBUG

CXX_RELEASE_FLAGS = -O3

CXX_DEFAULT_FLAGS = -c -std=c++11 $(FLAGS_COMMON)

LDFLAGS = -Wall -lvlkbcommon -lcfitsio -lcsv -last -last_grf_2.0 -last_grf_3.2 -last_grf_5.6 -last_grf3d -last_err -lstdc++ -lm  

LDFLAGS = -Wall -lvlkbcommon -ldavix -lcfitsio -lcsv -last -last_pal -last_cminpack -last_grf_2.0 -last_grf_3.2 -last_grf_5.6 -last_grf3d -last_err -lstdc++ -lm  

INC_PARM=$(foreach d, $(INC_DIR), -I$d)

LIB_PARM=$(foreach d, $(LIB_DIR), -L$d)

#================================================================================

data-access/engine/src/vlkb/src/imcopy.cpp

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ int stream_cutout(string pathname, int extnum, string region) 
   {

      string pixfilter{ to_cfitsio_format(bnds) };



      imcopy(pathname, extnum, pixfilter, "dummy");

      imcopy(pathname, extnum, pixfilter);

      return EXIT_SUCCESS;



   }
@@ -59,13 +59,12 @@ int fits_copy_image_section2( 






void imcopy(std::string filename, int extnum, std::string pixfilter, std::string temp_root)

void imcopy(std::string filename, int extnum, std::string pixfilter)

{

   LOG_trace(__func__);



   LOG_STREAM << filename << " EXT: " << extnum << endl;

   LOG_STREAM << "pixfilter: " << pixfilter << endl;

   LOG_STREAM << "temp_root: " << temp_root << endl;



   int status = 0;

data-access/engine/src/vlkb/src/imcopy.hpp

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include <string>



void imcopy(std::string filename, int extnum, std::string pixfilter, std::string temp_root);

void imcopy(std::string filename, int extnum, std::string pixfilter);

int stream_cutout(std::string pathname, int extnum, std::string region);

#endif

data-access/engine/src/vlkb/src/imcopydav.cpp

0 → 100644
+674 −0

File added.

Preview size limit exceeded, changes collapsed.

data-access/engine/src/vlkb/src/imcopydav.hpp

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef IMCOPYDAV_HPP

#define IMCOPYDAV_HPP



#include <string>



void imcopydav(std::string url, int extnum, std::string pixfilter);

int stream_cutout_dav(std::string url, int extnum, std::string region);



#endif