Changeset 3910 for trunk/MagicSoft/Mars/mtemp

Timestamp:

04/30/04 15:46:55 (21 years ago)

Author:

jlopez

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• IFAELinkDef.h (modified) (1 diff)
• MSrcPosFromFile.h (modified) (1 diff)
• Makefile (modified) (4 diffs)
• psffit.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/IFAELinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class MDCA+;
+#pragma link C++ class MPSFFit+;
+#pragma link C++ class MPSFFitCalc+;
+#pragma link C++ class MSrcPosFromFile+;
 
 #endif

trunk/MagicSoft/Mars/mtemp/mifae/MSrcPosFromFile.h

@@ -45 +45 @@
     enum OnOffMode_t {kOn=0,kOff};
 
-    MSrcPosFromFile(TString cardpath=NULL, OnOffMode_t mode=kOn, const char *name=NULL, const char *title=NULL);
+    MSrcPosFromFile(TString cardpath, OnOffMode_t mode=kOn, const char *name=NULL, const char *title=NULL);
     ~MSrcPosFromFile();
     

trunk/MagicSoft/Mars/mtemp/mifae/Makefile

@@ -22 +22 @@
 #
 
-PROGRAMS = makeHillas
+PROGRAMS = makeHillas psffit
 SOLIB    = ../../libmars.so
-LIB      = mifae.a
+LIB      = libmifae.a
 
 #------------------------------------------------------------------------------
@@ -44 +44 @@
            -I../../mimage \
            -I../../mpointing \
+           -I../../mcamera \
            -I../../mastro
 
@@ -50 +51 @@
 
 SRCFILES = \
-        MDCA.cc 
+        MDCA.cc \
+        MPSFFit.cc \
+        MPSFFitCalc.cc \
+        MSrcPosFromFile.cc
 #       MSrcRotate.cc 
 
@@ -67 +71 @@
 $(PROGRAMS): $(SOLIB) $(LIB) $(PROGRAMS:=.o)
         @echo " Linking $@ ..." 
-        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $(LIB) $@.o $(MARS_LIB) -o $@
+        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) ${OBJS} -L. -lmifae $@.o $(MARS_LIB) -o $@
 
 mrproper: clean rmbak

trunk/MagicSoft/Mars/mtemp/mifae/psffit.cc

@@ -23 +23 @@
 \* ======================================================================== */
 
-#include <iostream.h>
+#include <iostream>
 
 #include <TString.h>
@@ -33 +33 @@
 #include "MCameraDC.h"
 #include "MPSFFit.h"
+
 #include "MReadReports.h"
 #include "MGeomApply.h"
 #include "MPSFFitCalc.h"
 #include "MEvtLoop.h"
+
+using namespace std;
 
 int main(int argc, char *argv[])