Changeset 1480 in Sophya for trunk/ArchTOIPipe/TestPipes

Timestamp:

Apr 27, 2001, 11:33:51 AM (24 years ago)

Author:

aubourg

Message:

join & merge

Location:

trunk/ArchTOIPipe/TestPipes

Files:

• Makefile.in (modified) (3 diffs)
• tstjoin.cc (added)
• tstseq.cc (added)
• tsttoi.cc (modified) (2 diffs)

trunk/ArchTOIPipe/TestPipes/Makefile.in

@@ -46 +46 @@
 CPPFLAGS    :=  $(CPPFLAGS) @cfitsincdir@ -I. -I.. -DANSI -I$(srcdir)/../kernel -I$(srcdir)/../processors -I$(srcdir)/../sophya -I$(srcdir)/..
 
-LDLIBS=@cfitslibdir@ -lcfitsio $(LIBS) -L.. -latkern -latproc
+ifeq ($(USE_SOPHYA),1)
+  LDLIBS=-L.. -latsop -latkern -latproc @cfitslibdir@ -lcfitsio $(LIBS) 
+  LIBDEPS=../libatsop.a ../libatkern.a ../libatproc.a
+else
+  LDLIBS=-L.. -latkern -latproc @cfitslibdir@ -lcfitsio $(LIBS) 
+  LIBDEPS=../libatkern.a ../libatproc.a
+endif
 
 ifeq ($(MACHEROS),IRIX64)
@@ -62 +68 @@
 endif
 
+ifeq ($(CXX), cxx)
+  CXXFLAGS := $(CXXFLAGS) -ptr ../cxx_repository
+endif
+
+
 default:
         echo "no program specified"
@@ -69 +80 @@
         rm -rf rii_files ii_files cxxrep cxx_repository
 
-%: %.o $(FILES)
+%: %.o $(FILES) $(LIBDEPS)
         $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -pthread -o $@ -lm
 

trunk/ArchTOIPipe/TestPipes/tsttoi.cc

@@ -1 +1 @@
 #include "toi.h"
-#include "toiregwindow.h"
+#include "toiseqbuff.h"
 #include "toiprocessor.h"
 #include "fitstoirdr.h"
@@ -16 +16 @@
 
   
-  TOI* toi = new TOIRegularWindow("t1");
+  TOI* toi = new TOISeqBuffered();
   //  toi->dbg=true;
   r.addOutput("boloMuV_11", toi);
   f.addInput("signal", toi);
 
-  toi = new TOIRegularWindow("t2");
+  toi = new TOISeqBuffered();
   // toi->dbg = true;
   f.addOutput("out", toi);