adaptation to icc. in test

cmt/camel_setup.sh

@@ -13,7 +13,7 @@ if [ ! -z "$CLIKDIR" ] ; then
     export CLIKCFLAGS
     CLIKLIBS=$($CLIKDIR/bin/clik-config --libs | sed 's/,-Bdynamic-Wl//g')
     export CLIKLIBS
-    echo "Using Planck software from: $CLIKDIR"
+    echo "CLIK support from: $CLIKDIR"
 fi
 
 if [ ! -f setup.sh ] ; then
@@ -22,23 +22,21 @@ cmt config
 fi
 
 source ./setup.sh
-echo "CAMELROOT=$CAMELROOT"
 
 #creating link if necessary
 if [ ! -z "${PLANCK_DATA}" ] ; then 
     echo "PLANCK_DATA=${PLANCK_DATA}"
     if [ ! -h ../par/planck_data ] ; then
 	ln -sf ${PLANCK_DATA} ${CAMELROOT}/par/planck_data
-	echo "creating a link in directory par/"
     fi
 else
     echo "no PLANCK_DATA defined"
 fi
 
 if [ ! -z "${HILLIPOP_DATA}" ] ; then 
+    echo HILLIPOP_DATA="${HILLIPOP_DATA}"
     if [ ! -h ../par/hillipop_data ] ; then
 	ln -sf ${HILLIPOP_DATA} ${CAMELROOT}/par/hillipop_data
-	echo "creating par/hillipop_data link ->${HILLIPOP_DATA}"
     fi
     else
     echo "HILLIPOP_DATA not used"
@@ -46,13 +44,13 @@ fi
 
 
 if [ -n "${PICO_CODE}" ] && [ -n "${PICO_DATA}" ] ; then
-echo "Using pico=${PICO_CODE} with training file=${PICO_DATA}"
+echo "PICO=${PICO_CODE} with training file=${PICO_DATA}"
 #sets your PYTHONPATH ccording to PICO_CODE
 export PYTHONPATH=${PICO_CODE}:$PYTHONPATH
 export PICOINC="$(python -c "import pypico; print pypico.get_include()")"
 export PICOLIBS="$(python -c "import pypico; print pypico.get_link()")"
-echo "includes=$PICOINC"
-echo "libs=$PICOLIBS"
+#echo "includes=$PICOINC"
+#echo "libs=$PICOLIBS"
 else
 echo "not using PICO"
 fi
@@ -61,5 +59,7 @@ fi
 #echo "Using project $CMTPATH"
 cmt show uses
 
+echo "your CAMELROOT is $CAMELROOT"
+
 #too see details during compilation uncomment
 #export VERBOSE=1

cmt/requirements-icc

@@ -34,10 +34,12 @@ macro_append cflags " -DCLIK  $(CLIKCFLAGS)"
 macro_append  CAMEL_linkopts " $(CLIKLIBS) "
 
 # PICO
-macro_append cppflags " -DPICO "
-include_dirs "$(PYTHONHOME)/include/python2.7"
-#include_dirs "$(PYTHONHOME)/lib/python2.7/site-packages/numpy/core/include"
-macro_append CAMEL_linkopts " -L$(PICO_CODE) -lpico -L$(PYTHONHOME)/lib -lpython2.7 "
+macro_append cppflags " -DPICO $(PICOINC) "
+macro_append CAMEL_linkopts " -L$(PICO_CODE) -lpico -lpython2.7 "
+# the previous line should be sufficient otherwise try the PICOLIBS 
+# (set in camel_setup.sh) y uncommenting teh follwing line
+#macro_append CAMEL_linkopts " $(PICOLIBS)"
+
 macro_append cppflags ' -DPICODATA=\"$(PICO_DATA)\" '
 application testPico -group=test -s=../src/camel/pico/exec testPico.cc
 application FitClassFromPico -group=exec -s=../src/camel exec/FitClassFromPico.cc

cmt/requirements-lite

@@ -54,7 +54,12 @@ macro_append  CAMEL_linkopts " -L$(CLIKDIR)/lib -lcfitsio"
 
 
 # PICO  [optional]
-# this part is tricky and for the moment obsolete..
+#macro_append cppflags " -DPICO $(PICOINC) "
+#macro_append CAMEL_linkopts " -L$(PICO_CODE) -lpico -lpython2.7 "
+# if the previous link fails try using the PICOLIBS defined in camel_setup.sh
+#macro_append cppflags ' -DPICODATA=\"$(PICO_DATA)\" '
+#application testPico -group=test -s=../src/camel/pico/exec testPico.cc
+
 #macro_append cppflags " -DPICO "
 #include_dirs "/usr/include/python2.7"
 #include_dirs "/usr/lib64/python2.7/site-packages/numpy/core/include"