migration to geneva0.9.1

Examples/EtacToapi0Fit/Jamfile

@@ -10,5 +10,5 @@ lib EtacToapi0Fit :
 	: 
 	: <library>$(TOP)//Minuit2 <library>$(TOP)//Geneva ;
 
-exe GEtacToapi0FitApp : GEtacToapi0FitApp.cc EtacToapi0Fit : ;
+#exe GEtacToapi0FitApp : GEtacToapi0FitApp.cc EtacToapi0Fit : ;
 exe MEtacToapi0FitApp : MEtacToapi0FitApp.cc EtacToapi0Fit : ;

Examples/Jamfile

 
-# build-project pbarpToOmegaPi ;
+build-project pbarpToOmegaPi ;
 build-project EtacToapi0Fit ;
 build-project Psi2SToKpKmPiGam ;
 build-project Psi2STo2K2PiGam ; 
-build-project GMultiPopulation ;
-build-project GStartProject ;
 build-project pbarp ;
 build-project SeqDecHeliAmps ; 

Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamApp.cc

@@ -26,8 +26,8 @@
 #include "Examples/Psi2STo2K2PiGam/MPsi2STo2K2PiGamFcn.hh"
 #include "Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamData.hh"
 #include "Examples/Psi2STo2K2PiGam/Stream2K2PiGamFitParms.hh"
-#include "Examples/Psi2STo2K2PiGam/GPsi2STo2K2PiGamFit.hh"
-#include "Examples/Psi2STo2K2PiGam/GPsi2STo2K2PiGamIndividual.hh"
+//#include "Examples/Psi2STo2K2PiGam/GPsi2STo2K2PiGamFit.hh"
+//#include "Examples/Psi2STo2K2PiGam/GPsi2STo2K2PiGamIndividual.hh"
 
 #include "Setup/PwaEnv.hh"
 #include "Particle/ParticleTable.hh"
@@ -231,14 +231,16 @@ int main(int __argc,char *__argv[]){
 
   bool prefit=false;
   if (prefit){
-    MnUserParameters uparPre;
-    thePsi2STo2K2PiGamLhPtr->setMnUsrParams(uparPre, theStartparams, theErrorparams);
-    uparPre.Fix(1);
-    uparPre.Fix(2); 
-    GPsi2STo2K2PiGamFit preFit(thePsi2STo2K2PiGamLhPtr, uparPre);
-    preFit.doFit();
-    boost::shared_ptr<GPsi2STo2K2PiGamIndividual> bestIndividual=preFit.bestIndividual();
-    bestIndividual->getFitParams(theStartparams);
+//     MnUserParameters uparPre;
+//     thePsi2STo2K2PiGamLhPtr->setMnUsrParams(uparPre, theStartparams, theErrorparams);
+//     uparPre.Fix(1);
+//     uparPre.Fix(2); 
+//     GPsi2STo2K2PiGamFit preFit(thePsi2STo2K2PiGamLhPtr, uparPre);
+//     preFit.doFit();
+//     boost::shared_ptr<GPsi2STo2K2PiGamIndividual> bestIndividual=preFit.bestIndividual();
+//     bestIndividual->getFitParams(theStartparams);
+    Alert << "Geneva prefit is currently not implemented " << pdtFile << endmsg;
+    exit(0);
   }
 
   MnUserParameters upar;

Examples/pbarpToOmegaPi/GOmegaPiApp.cc

@@ -187,21 +187,21 @@ bl::tribool GenEvA(
     // Create a model that holds the static data needed for processing
     boost::shared_ptr<gp::GOmegaPiIndividual> gopi_ptr( new gp::GOmegaPiIndividual(finalOmegaPiLh) );
 
-    boost::shared_ptr<gc::GAsioTCPClientT<gg::GIndividual> > p(
-	  new gc::GAsioTCPClientT<gg::GIndividual>(
-             theAppParams.getIp()
-             , boost::lexical_cast<std::string>(theAppParams.getPort())
-	     , gopi_ptr
-          )
-    );
-    p->setMaxStalls(0); // An infinite number of stalled data retrievals
-    p->setMaxConnectionAttempts(100); // Up to 100 failed connection attempts
-
-    // Prevent return of unsuccessful mutation attempts to the server
-    p->returnResultIfUnsuccessful(theAppParams.getReturnRegardless());
-
-    // Start the actual processing loop
-    p->run();
+//     boost::shared_ptr<gc::GAsioTCPClientT<gg::GIndividual> > p(
+// 	  new gc::GAsioTCPClientT<gg::GIndividual>(
+//              theAppParams.getIp()
+//              , boost::lexical_cast<std::string>(theAppParams.getPort())
+// 	     , gopi_ptr
+//           )
+//     );
+//     p->setMaxStalls(0); // An infinite number of stalled data retrievals
+//     p->setMaxConnectionAttempts(100); // Up to 100 failed connection attempts
+
+//     // Prevent return of unsuccessful mutation attempts to the server
+//     p->returnResultIfUnsuccessful(theAppParams.getReturnRegardless());
+
+//     // Start the actual processing loop
+//     p->run();
 
     return bl::indeterminate;
   }

Jamroot

@@ -24,8 +24,14 @@ actions rootlibs
 
 lib log4cpp : : <file>$(extern)/lib/liblog4cpp.a : : ;
 lib Minuit2 : : <file>$(MINUIT2)/lib/libMinuit2.a : : ;
-lib Geneva  : : <file>$(GENEVA)/lib/libgeneva-opt.so : : ;
-
+#lib Geneva  : : <file>$(GENEVA)/lib/libgeneva-opt.so : : ;
+#lib Geneva : :  <file>$(GENEVA)/lib/libgemfony-common.so : : ;
+#lib Geneva : :  <file>$(GENEVA)/lib/libgemfony-courtier.so : : ;
+#lib Geneva : :  <file>$(GENEVA)/lib/libgemfony-geneva-individuals.so : : ;
+# lib Geneva : :  <file>$(GENEVA)/lib/libgemfony-geneva.so : : ;
+#lib Geneva : :  <file>$(GENEVA)/lib/libgemfony-hap.so : : <file>$(GENEVA)/lib/libgemfony-common.so : : ;
+ lib Geneva : :  <file>$(GENEVA)/lib/libgeneva-all.so : : ;
+ 
 build-project qft++ ;
 build-project Utils ;
 build-project ErrLogger ;