Index: /trunk/magic/Makefile
===================================================================
--- /trunk/magic/Makefile	(revision 26889)
+++ /trunk/magic/Makefile	(revision 26890)
@@ -2,7 +2,7 @@
 default: all
 
-all: ssa-core-cpp magic
+all: ssa-core-cpp magic verify
 
-install: magic.install
+install: magic.install verify.install
 
 clean:
@@ -15,4 +15,5 @@
 	tar xvzf ~/ssa-core-cpp.tgz
 	cp Makefile.magic magic/Makefile.magic
+	cp magic/VerifyStreaks/main.cpp verify/VerifyStreaks.cpp
 
 ssa-core-cpp: ssa-core-cpp/build/libSSA.a
@@ -29,3 +30,22 @@
 	if [ -d magic ]; then (cd magic && make -f Makefile.magic install); fi
 
+update.verify:
+	cp magic/VerifyStreaks/main.cpp verify/VerifyStreaks.cpp
+
+verify: verify/VerifyStreaks
+
+verify/VerifyStreaks:
+	if [ -d magic ]; then (cd verify && make); fi
+
+verify.install:
+	if [ -d magic ]; then (cd verify && make install); fi
+
+# REMOVE = remove/src
+# 
+# remove: FORCE
+# 	@cd $(REMOVE) && make -f Makefile.simple all
+# 
+# remove.install: remove
+# 	@cd $(REMOVE) && make -f Makefile.simple install
+
 FORCE:
Index: /trunk/magic/remove/src/Makefile.am
===================================================================
--- /trunk/magic/remove/src/Makefile.am	(revision 26889)
+++ /trunk/magic/remove/src/Makefile.am	(revision 26890)
@@ -84,5 +84,4 @@
 	streaksextern.h \
 	streaksio.h 	\
-	streaksremove.h \
 	streaksVersionDefinitions.h
 
Index: /trunk/magic/remove/src/streaksremove.c
===================================================================
--- /trunk/magic/remove/src/streaksremove.c	(revision 26889)
+++ /trunk/magic/remove/src/streaksremove.c	(revision 26890)
@@ -273,5 +273,5 @@
         } else {
             fprintf(sfiles->statsFile, "%s", statsMDC);
-            psFree((void *)statsMDC);
+            psFree(statsMDC);
             fclose(sfiles->statsFile);
             sfiles->statsFile = NULL;
Index: /trunk/magic/verify/Makefile
===================================================================
--- /trunk/magic/verify/Makefile	(revision 26890)
+++ /trunk/magic/verify/Makefile	(revision 26890)
@@ -0,0 +1,35 @@
+TARGETS =  VerifyStreaks
+
+CXX = c++
+CXXFLAGS = -W -Wall -O3 -DNDEBUG
+# CXXFLAGS = -W -Wall -g
+
+SSA_SRC = ../ssa-core-cpp/src
+SSA_LIB = ../ssa-core-cpp/build
+MAGIC_SRC = ../magic/
+
+PSLIB_DIR = $(PSCONFDIR)/$(PSCONFIG)/lib
+PSINC_DIR = $(PSCONFDIR)/$(PSCONFIG)/include
+
+CINC = -I. -I$(SSA_SRC) -I$(PSINC_DIR) -I$(MAGIC_SRC)
+CLIB = -L. -L$(SSA_LIB) -I$(PSINC_DIR) -lcfitsio -lSSA -lQtCore -lQtGui
+
+all : $(TARGETS)
+
+% :: %.cpp
+	$(CXX) $(CXXFLAGS) $(CINC) $< $(CLIB) -o $@
+
+.PHONY : clean
+
+.SILENT : clean
+
+clean :
+	   - rm $(TARGETS)
+
+DESTDIR=$(PSCONFDIR)/$(PSCONFIG)
+
+install: $(TARGETS)
+	cp VerifyStreaks $(DESTDIR)/bin
+	chmod 755  $(DESTDIR)/bin/VerifyStreaks
+	cp verifystreaks.sh $(DESTDIR)/bin
+	chmod 755  $(DESTDIR)/bin/verifystreaks.sh
Index: /trunk/magic/verify/verifystreaks.sh
===================================================================
--- /trunk/magic/verify/verifystreaks.sh	(revision 26890)
+++ /trunk/magic/verify/verifystreaks.sh	(revision 26890)
@@ -0,0 +1,21 @@
+#!/bin/csh -f
+
+if ($#argv != 4) then 
+  echo "USAGE: verifystreaks.sh (workdir) (exp_id) (magic_id) (outdir)"
+  exit 1
+endif
+
+set workdir = $1
+set expID = $2
+set magicID = $3
+set outdir = $4
+
+mkdir -p $outdir
+
+# make clusters file:
+ls $workdir/$expID/$expID.mgc.$magicID.*.clusters | sed s/.clusters// > $outdir/clusters.list
+
+# run VerifyStreaks
+
+VerifyStreaks --out $outdir --clusters $outdir/clusters.list $workdir/$expID/$expID.mgc.$magicID.root.streakMap
+