Changeset 3180 in Sophya for trunk/SophyaLib

Timestamp:

Feb 7, 2007, 12:28:06 PM (19 years ago)

Author:

cmv

Message:

modifs suite a la suppression de CodeMinuit et MinuitAdapt cmv 07/02/2007

Location:

trunk/SophyaLib

Files:

• BuildMgr/Makefile (modified) (1 diff)
• BuildMgr/README (modified) (2 diffs)
• BuildMgr/configure (modified) (2 diffs)
• BuildMgr/domkmf (modified) (1 diff)
• BuildMgr/smakefile (modified) (1 diff)
• Manual/sophya.tex (modified) (4 diffs)

trunk/SophyaLib/BuildMgr/Makefile

@@ -23 +23 @@
         if [ -f $(SOPHYAINCP)/SophyaConfInfo/LinAlg.conf ] ; then cd  ../LinAlg ; $(MAKE) ; fi
         if [ -f $(SOPHYAINCP)/SophyaConfInfo/XAstroPack.conf ] ; then cd  ../XAstroPack ; $(MAKE) ; fi
-        if [ -f $(SOPHYAINCP)/SophyaConfInfo/MinuitAdapt.conf ] ; then cd  ../MinuitAdapt ; $(MAKE) ; fi
  
 PI::

trunk/SophyaLib/BuildMgr/README

@@ -28 +28 @@
 # run the configure script 
 csh> ./configure -sbase $SOPHYABASE -scxx g++ -extp /usr/local 
-     -noext fftw -noext lapack -noext astro -noext minuit
+     -noext fftw -noext lapack -noext astro
 
 2/ compile and build the libraries
@@ -113 +113 @@
 * XAstroPack/    Interface with astronomy library (XEphem)
                  The XEphem library code is in the SOPHYA module XephemAstroLib
-* MinuitAdapt/   Inteface with the CERN Minuit minimization routines
 
 * XephemAstroLib/ The code of the external XEphem astronomy library, extracted from XEphem

trunk/SophyaLib/BuildMgr/configure

@@ -15 +15 @@
 set ALLPILIBS = ( '-lPI' '-lPIext' '-lPIGcont' )
 
-set SOPEXT     = ( FitsIOServer  IFFTW  LinAlg  XAstroPack  MinuitAdapt )
-set EXTCURNAME = ( fits          fftw   lapack  astro       minuit      )
-set SOPEXTOK   = ( 1             1      1       1           1           )
-set EXTINCNAME = ( FitsIO/fitsio.h FFTW/fftw3.h  PASDEINC XAstro/astro.h Cern/minuit.h )
-set EXTLIBNAME = ( libcfitsio.a libfftw3.a liblapack.a libxastro.a libminuit.a )
-set ALLEXTLIBS = ( '-lcfitsio' '-lfftw3' '-llapack -lblas' '-lxastro' '-lminuit' )
-
-#FFTW2: set EXTINCNAME = ( FitsIO/fitsio.h FFTW/fftw.h  PASDEINC XAstro/astro.h Cern/minuit.h )
-#FFTW2: set EXTLIBNAME = ( libcfitsio.a libfftw.a liblapack.a libxastro.a libminuit.a )
-#FFTW2: set ALLEXTLIBS = ( '-lcfitsio' '-lfftw -lrfftw' '-llapack -lblas' '-lxastro' '-lminuit' )
+set SOPEXT     = ( FitsIOServer  IFFTW  LinAlg  XAstroPack )
+set EXTCURNAME = ( fits          fftw   lapack  astro      )
+set SOPEXTOK   = ( 1             1      1       1          )
+set EXTINCNAME = ( FitsIO/fitsio.h FFTW/fftw3.h  PASDEINC XAstro/astro.h )
+set EXTLIBNAME = ( libcfitsio.a libfftw3.a liblapack.a libxastro.a )
+set ALLEXTLIBS = ( '-lcfitsio' '-lfftw3' '-llapack -lblas' '-lxastro' )
+
+#FFTW2: set EXTINCNAME = ( FitsIO/fitsio.h FFTW/fftw.h  PASDEINC XAstro/astro.h )
+#FFTW2: set EXTLIBNAME = ( libcfitsio.a libfftw.a liblapack.a libxastro.a )
+#FFTW2: set ALLEXTLIBS = ( '-lcfitsio' '-lfftw -lrfftw' '-llapack -lblas' '-lxastro' )
 
 set defextinc = ( /usr/include /usr/local/include )
@@ -46 +46 @@
   echo 'configure [-sbase SOPHYABASE] [-scxx SOPHYACXX] [-incln] [-minc mymake.inc] '
   echo '  [-extp dir1 -extp dir2 ...] [-extip dir1 -extip dir2 ... ] [-extlp dir1 -extlp dir2 ... ]'
-  echo '  [-noextlib -noext fits -noext fftw -noext lapack -noext astro -noext minuit]'
+  echo '  [-noextlib -noext fits -noext fftw -noext lapack -noext astro]'
   echo '  [-usefftw2 -uselapack2] [-singleslb]'
   exit -1

trunk/SophyaLib/BuildMgr/domkmf

@@ -14 +14 @@
 
 echo " ==== Creation smakefile pour les modules EXTLIBS_SOPHYA ===="
-### ATTENTION ### ne pas faire mkmflib pour MinuitAdapt
 foreach f ( FitsIOServer IFFTW LinAlg XAstroPack )
   set cmd = "./mkmflib $* $f" 

trunk/SophyaLib/BuildMgr/smakefile

@@ -23 +23 @@
         if [ -f $(SOPHYAINCP)/SophyaConfInfo/LinAlg.conf ] ; then cd  ../LinAlg ; $(MAKE) -f smakefile ; fi
         if [ -f $(SOPHYAINCP)/SophyaConfInfo/XAstroPack.conf ] ; then cd  ../XAstroPack ; $(MAKE) -f smakefile ; fi
-        if [ -f $(SOPHYAINCP)/SophyaConfInfo/MinuitAdapt.conf ] ; then cd  ../MinuitAdapt ; $(MAKE) -f smakefile ; fi
  
 PI::

trunk/SophyaLib/Manual/sophya.tex

@@ -162 +162 @@
 Information on Xephem can be found at : \\
 \href{http://www.clearskyinstitute.com/xephem/}{http://www.clearskyinstitute.com/xephem/}
-\item[] {\bf MinuitAdapt/} Wrapper classes to CERN minimization routines (Minuit).  \\
-\href{http://wwwinfo.cern.ch/asdoc/minuit/minmain.html}{http://wwwinfo.cern.ch/asdoc/minuit/minmain.html}
 
 \end{itemize}
@@ -2075 +2073 @@
   [-extlp dir1 -extlp dir2 ... ]
   [-noextlib -noext fits -noext fftw -noext lapack ]
-  [-noext astro -noext minuit]
+  [-noext astro]
   [-usefftw2 -uselapack2] [-singleslb]
 \end{verbatim}
@@ -2108 +2106 @@
 {\tt /usr/local/Sophya} directory, using {\tt g++}. We assume that 
 the external libraries can be found in {\tt /usr/local/ExtLibs/}. 
-We disable the compilation of the MinuitAdapt and XAstrPack packages.
+We disable the compilation of the XAstroPack package.
 
 \vspace*{3mm}
@@ -2117 +2115 @@
 # Step 1.a : Run the configuration script 
 csh> ./configure -sbase /usr/local/Sophya -scxx g++  -extp /usr/local/ExtLibs/ \
--noext astro -noext minuit 
+-noext astro
 # Step 1.b : Check the generated file  $SOPHYABASE/include/sophyamake.inc
 csh> ls -lt *.inc