Merge pull request #1248 from NNPDF/rmrevolve

removing revolve and obsolete scripts

nnpdfcpp/CMakeLists.txt

@@ -10,10 +10,6 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/binaries)
 # execute project specific targets
 add_subdirectory(src)
 
-# install scripts
-install(FILES ${PROJECT_SOURCE_DIR}/nnpdfcpp/scripts/fitmanager
-  DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
 # install data
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/nnpdfcpp/data/ DESTINATION ${PROFILE_PREFIX}/data/ MESSAGE_NEVER)
 

nnpdfcpp/README.md

@@ -1,6 +1,6 @@
 # nnpdfcpp
-The main programs used in the NNPDF fitting framework. 
- 
+The main programs used in the NNPDF fitting framework.
+
 ## Project summary and aim
 
 This project contains the principle fitting code of the NNPDF collaboration,
@@ -13,6 +13,5 @@ The main projects are
   but filter.
 
 and the extra optional programs:
-- revolve:    (re-)evolve PDF set using APFEL
-- revolvenet: (re-)evolve PDF neural network using APFEL
+- evolvefit: evolve PDF neural network using APFEL
 - fiatlux: generate a T0 set with the photon PDF via `libfiatlux`

nnpdfcpp/src/CMakeLists.txt

@@ -58,7 +58,7 @@ endif(COMPILE_chi2check)
 #    )
 #  # validphys
 #  option(COMPILE_validphys "Compile validphys program." OFF)
-#  if (COMPILE_validphys)  
+#  if (COMPILE_validphys)
 #    add_executable(validphys validphys/src/validphys.cc
 #      validphys/src/plotdata.cc
 #      validphys/src/plotutils.cc)
@@ -72,16 +72,7 @@ endif(COMPILE_chi2check)
 #  message(WARNING "ROOT not found: validphys compilation is disabled, install ROOT and rerun cmake to enable the validphys compilation")
 #endif(ROOT_CONFIG)
 
-# revolve
-option(COMPILE_revolve "Compile revolve program." OFF)
-if (COMPILE_revolve)
-  add_executable(revolve revolve/src/revolve.cc)
-  target_link_libraries(revolve common nnpdf ${LHAPDF_LIBRARIES} ${YAML_LDFLAGS} ${ROOT_LIBRARIES} ${APFEL_LIBRARIES} ${GSL_LDFLAGS})
-  install(TARGETS revolve DESTINATION bin
-          PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)  
-endif(COMPILE_revolve)
-
-# revolvenet
+# evolvefit
 option(COMPILE_evolvefit "Compile evolvefit program." OFF)
 if (COMPILE_evolvefit)
   add_executable(evolvefit
@@ -90,7 +81,7 @@ if (COMPILE_evolvefit)
   include_directories(evolvefit/inc nnfit/inc)
   target_link_libraries(evolvefit common nnpdf ${YAML_LDFLAGS} ${APFEL_LIBRARIES} ${GSL_LDFLAGS})
   install(TARGETS evolvefit DESTINATION bin
-          PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)  
+          PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif(COMPILE_evolvefit)
 
 # libfiatlux
@@ -114,5 +105,5 @@ if (FIATLUX_CONFIG)
           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
   endif(COMPILE_fiatlux)
 else(FIATLUX_CONFIG)
-  message(WARNING "libfiatlux not found: fiatlux compilation is disabled, install libfiatlux and rerun cmake to enable the fiatlux compilation")  
+  message(WARNING "libfiatlux not found: fiatlux compilation is disabled, install libfiatlux and rerun cmake to enable the fiatlux compilation")
 endif(FIATLUX_CONFIG)