xcoll 0.6.0__tar.gz → 0.6.2__tar.gz

{xcoll-0.6.0 → xcoll-0.6.2}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: xcoll
-Version: 0.6.0
+Version: 0.6.2
 Summary: Xsuite collimation package
-Home-page: https://github.com/xsuite/xcoll
 License: Apache 2.0
 Author: Frederik F. Van der Veken
 Author-email: frederik@cern.ch
@@ -14,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: tests
 Requires-Dist: numpy (>=1.0)
 Requires-Dist: pandas (>=1.4)
@@ -21,7 +21,8 @@ Requires-Dist: ruamel-yaml (>=0.17.31,<0.18.0) ; extra == "tests"
 Requires-Dist: xdeps (>=0.10.5)
 Requires-Dist: xobjects (>=0.5.0)
 Requires-Dist: xpart (>=0.23.0)
-Requires-Dist: xtrack (>=0.84.5)
+Requires-Dist: xtrack (>=0.84.8)
+Project-URL: Homepage, https://github.com/xsuite/xcoll
 Project-URL: Repository, https://github.com/xsuite/xcoll
 Description-Content-Type: text/markdown
 

{xcoll-0.6.0 → xcoll-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "xcoll"
-version = "0.6.0"
+version = "0.6.2"
 description = "Xsuite collimation package"
 homepage = "https://github.com/xsuite/xcoll"
 repository = "https://github.com/xsuite/xcoll"
@@ -17,7 +17,7 @@ authors = [
 ]
 readme = "README.md"
 license = "Apache 2.0"
-include = ["LICENSE", "NOTICE"]
+exclude = ["xcoll/lib", "xcoll/config"]
 
 
 [tool.poetry.dependencies]
@@ -28,7 +28,7 @@ pandas = ">=1.4"
 xobjects = ">=0.5.0"
 xdeps = ">=0.10.5"
 xpart = ">=0.23.0"
-xtrack = ">=0.84.5"
+xtrack = ">=0.84.8"
 
 [poetry.group.dev.dependencies]
 pytest = ">=7.3"

{xcoll-0.6.0 → xcoll-0.6.2}/xcoll/general.py

@@ -12,5 +12,5 @@ citation = "F.F. Van der Veken, et al.: Recent Developments with the New Tools f
 # ======================
 # Do not change
 # ======================
-__version__ = '0.6.0'
+__version__ = '0.6.2'
 # ======================

{xcoll-0.6.0 → xcoll-0.6.2}/xcoll/plot.py

@@ -5,7 +5,6 @@
 
 import numpy as np
 from numbers import Number
-import matplotlib.pyplot as plt
 
 
 _NORMS = ["total", "coll_max", "max", "none", "raw"]
@@ -13,6 +12,7 @@ _NORMS = ["total", "coll_max", "max", "none", "raw"]
 
 def _plot_lossmap_base(lossmap: dict, *, norm="total", ax=None, xlim=None, ylim=None,
                        legend=True, grid=True, energy=False, show=True, savefig=None):
+    import matplotlib.pyplot as plt
     if norm in _NORMS:
         norm = norm.lower()
     elif not isinstance(norm, Number):

xcoll-0.6.0/xcoll/scattering_routines/fluka/flukaio/.git

@@ -1 +0,0 @@
-gitdir: ../../../../.git/modules/xcoll/scattering_routines/fluka/flukaio

xcoll-0.6.0/xcoll/scattering_routines/fluka/flukaio/.gitignore

@@ -1,2 +0,0 @@
-lib
-src/*.d

xcoll-0.6.0/xcoll/scattering_routines/fluka/flukaio/CMakeLists.txt

@@ -1,18 +0,0 @@
-PROJECT(FLUKA_IO)
-cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
-
-SET(LIBFLUKAIO_SOURCES src/Connection.c src/FlukaIO.c src/FlukaIOHandshake.c src/FlukaIOServer.c src/FortranFlukaIO.c src/NetIO.c)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-add_library(flukaIO STATIC ${LIBFLUKAIO_SOURCES})
-
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES AMD64 OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64 OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES i686)
-	if(32BIT)
-		target_compile_options(flukaIO PRIVATE -m32)
-	endif(32BIT)
-
-	if(64BIT)
-		target_compile_options(flukaIO PRIVATE -m64)
-	endif(64BIT)
-endif()

xcoll-0.6.0/xcoll/scattering_routines/fluka/flukaio/ComponentMakefile

@@ -1,192 +0,0 @@
-#---------
-#
-# ComponentMakefile
-#
-# Include this file in your makefile
-# It makes
-#    A static library
-#    A test executable
-#
-# The necessary parameters are shown in 
-#    ComponentMakefileExampleParameters
-#
-# Inputs 
-#   SRC_FILES - Specific source files to build into library
-#	SRC_DIRS - Directories od source file to built into the library
-#	TEST_SRC - unit test code build into the unit test runner
-#	MOCKS_SRC - mock objects build into the test runner
-#	INCLUDES - List of -I files
-#	CPPUTEST_CXXFLAGS - flags for the C++ compiler
-#	CPPUTEST_CPPFLAGS - flags for the C++ AND C compiler
-#	CPPUTEST_CFLAGS - C complier
-#	CPPUTEST_LDFLAGS - Linker flags
-#	TARGET_LIB -  the created library
-#	TEST_TARGET - the created test executable
-#	OTHER_MAKEFILE_TO_INCLUDE - a hook to use this makefile to make 
-#		other targets. Like CSlim, which is part of fitnesse
-#----------
-
-#Helper Functions
-get_src_from_dir  = $(wildcard $1/*.cpp) $(wildcard $1/*.c)
-get_dirs_from_dirspec  = $(wildcard $1)
-get_src_from_dir_list = $(foreach dir, $1, $(call get_src_from_dir,$(dir)))				        
-src_to_o = $(subst .c,.o, $(subst .cpp,.o,$1))
-src_to_d = $(subst .c,.d, $(subst .cpp,.d,$1))
-#move_file_location = $(patsubst %.d,build/%.d, $1)
-src_to = $(subst .c,$1, $(subst .cpp,$1,$2))
-
-#Derived
-STUFF_TO_CLEAN += $(TEST_TARGET) $(TEST_TARGET).exe $(TARGET_LIB)
-
-SRC += $(call get_src_from_dir_list, $(SRC_DIRS)) $(SRC_FILES)			        
-OBJ = $(call src_to_o,$(SRC))
-STUFF_TO_CLEAN += $(OBJ)
-
-TEST_SRC = $(call get_src_from_dir_list, $(TEST_SRC_DIRS))
-TEST_OBJS = $(call src_to_o,$(TEST_SRC))
-STUFF_TO_CLEAN += $(TEST_OBJS)
-
-MOCKS_SRC = $(call get_src_from_dir_list, $(MOCKS_SRC_DIRS))
-MOCKS_OBJS = $(call src_to_o,$(MOCKS_SRC))
-STUFF_TO_CLEAN += $(MOCKS_OBJS)
-
-ALL_SRC = $(SRC) $(TEST_SRC) $(MOCKS_SRC)
-
-#Test coverage with gcov
-GCOV_OUTPUT = gcov_output.txt
-GCOV_REPORT = gcov_report.txt
-GCOV_ERROR = gcov_error.txt
-GCOV_GCDA_FILES = $(call src_to,.gcda, $(ALL_SRC))
-GCOV_GCNO_FILES = $(call src_to,.gcno, $(ALL_SRC))
-TEST_OUTPUT = $(TEST_TARGET).txt
-STUFF_TO_CLEAN += \
-	$(GCOV_OUTPUT)\
-	$(GCOV_REPORT)\
-	$(GCOV_ERROR)\
-	$(GCOV_GCDA_FILES)\
-	$(GCOV_GCNO_FILES)\
-	$(TEST_OUTPUT)
-
-
-#Other stuff needed
-CPPUTEST_LIB = $(CPPUTEST_HOME)/lib/libCppUTest.a 
-
-CPPUTEST_CPPFLAGS +=  $(INCLUDES) $(GCOVFLAGS)
-
-#The gcda files for gcov need to be deleted before each run
-#To avoid annoying messages.
-GCOV_CLEAN = $(SILENCE)rm -f $(GCOV_GCDA_FILES) $(GCOV_OUTPUT) $(GCOV_REPORT) $(GCOV_ERROR)
-RUN_TEST_TARGET = $(SILENCE)  $(GCOV_CLEAN) ; echo "Running $(TEST_TARGET)"; ./$(TEST_TARGET)
-
-ifneq "$(OTHER_MAKEFILE_TO_INCLUDE)" ""
--include $(OTHER_MAKEFILE_TO_INCLUDE)
-endif
-
-ifneq "$(MAP_FILE)" ""
-	CPPUTEST_LDFLAGS += -Wl,-map,$(MAP_FILE)
-endif
-
-INCLUDES_DIRS_EXPANDED = $(call get_dirs_from_dirspec, $(INCLUDE_DIRS))
-INCLUDES += $(foreach dir, $(INCLUDES_DIRS_EXPANDED), -I$(dir))
-MOCK_DIRS_EXPANDED = $(call get_dirs_from_dirspec, $(MOCKS_SRC_DIRS))
-INCLUDES += $(foreach dir, $(MOCK_DIRS_EXPANDED), -I$(dir))
-
-
-DEP_FILES = $(call src_to_d, $(ALL_SRC))
-STUFF_TO_CLEAN += $(DEP_FILES) + $(PRODUCTION_CODE_START) + $(PRODUCTION_CODE_END)
-STUFF_TO_CLEAN += $(STDLIB_CODE_START) + $(MAP_FILE) + cpputest_*.xml junit_run_output
-
-# We'll use the CPPUTEST_CFLAGS etc so that you can override AND add to the CppUTest flags
-CFLAGS = $(CPPUTEST_CFLAGS) $(CPPUTEST_ADDITIONAL_CFLAGS)
-CPPFLAGS = $(CPPUTEST_CPPFLAGS) $(CPPUTEST_ADDITIONAL_CPPFLAGS)
-CXXFLAGS = $(CPPUTEST_CXXFLAGS) $(CPPUTEST_ADDITIONAL_CXXFLAGS)
-LDFLAGS = $(CPPUTEST_LDFLAGS) $(CPPUTEST_ADDITIONAL_LDFLAGS)
-
-# Targets
-.PHONY: all
-all: $(TEST_TARGET) 
-	$(RUN_TEST_TARGET)
-
-.PHONY: all_no_tests
-all_no_tests: $(TEST_TARGET)
-
-.PHONY: flags
-flags: 
-	$(SILENCE)echo Compile with these flags:
-	$(SILENCE)for f in $(CPPFLAGS) ; do \
-		echo "    C++ $$f" ; \
-	done
-	$(SILENCE)for f in $(CFLAGS) ; do \
-		echo "    C   $$f" ; \
-	done
-	$(SILENCE)for f in $(LDFLAGS) ; do \
-		echo "    LD   $$f" ; \
-	done
-	$(SILENCE)for f in $(ARFLAGS) ; do \
-		echo "    AR   $$f" ; \
-	done
-	
-	
-$(TEST_TARGET): $(TEST_OBJS) $(MOCKS_OBJS)  $(PRODUCTION_CODE_START) $(TARGET_LIB) $(USER_LIBS) $(PRODUCTION_CODE_END) $(CPPUTEST_LIB) $(STDLIB_CODE_START) 
-	$(SILENCE)echo Linking $@
-	$(SILENCE)echo command $(LINK.o) -o $@ $^ $(LD_LIBRARIES)
-	$(SILENCE)$(LINK.o) -o $@ $^ $(LD_LIBRARIES)
-
-$(TARGET_LIB): $(OBJ)
-	$(SILENCE)echo Building archive $@
-	$(SILENCE)mkdir -p lib
-	$(SILENCE)echo command $(AR) $(ARFLAGS) $@ $^
-	$(SILENCE)$(AR) $(ARFLAGS) $@ $^
-	$(SILENCE)ranlib $@
-
-test: $(TEST_TARGET)
-	$(RUN_TEST_TARGET) | tee $(TEST_OUTPUT)
-	
-vtest: $(TEST_TARGET)
-	$(RUN_TEST_TARGET) -v  | tee $(TEST_OUTPUT)
-
-%.o: %.cpp
-	@echo compiling $(notdir $<)
-	$(SILENCE)echo command $(COMPILE.cpp) -M -MF $(subst .o,.d,$@) -MT "$@ $(subst .o,.d,$@)" $<
-	$(SILENCE)$(COMPILE.cpp) -M -MF $(subst .o,.d,$@) -MT "$@ $(subst .o,.d,$@)" $<
-	$(SILENCE)echo command $(COMPILE.cpp) $(OUTPUT_OPTION) $<
-	$(SILENCE)$(COMPILE.cpp) $(OUTPUT_OPTION) $<
-
-%.o: %.c
-	@echo compiling $(notdir $<)
-	$(SILENCE)echo command $(COMPILE.c) -M -MF $(subst .o,.d,$@) -MT "$@ $(subst .o,.d,$@)" $<
-	$(SILENCE)$(COMPILE.c) -M -MF $(subst .o,.d,$@) -MT "$@ $(subst .o,.d,$@)" $<
-	$(SILENCE)echo command $(COMPILE.c) $(OUTPUT_OPTION) $<
-	$(SILENCE)$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-ifneq "$(MAKECMDGOALS)" "clean"
--include $(DEP_FILES)
-endif
-
-.PHONY: clean
-clean:
-	$(SILENCE)echo Making clean
-	$(SILENCE)$(RM) -rf $(STUFF_TO_CLEAN)
-	$(SILENCE)find . -name \*.gcov | xargs rm -f
-
-gcov: test
-	$(SILENCE)for d in $(SRC_DIRS) ; do \
-		gcov -o $$d $$d/*.c $$d/*.cpp >> $(GCOV_OUTPUT) 2>>$(GCOV_ERROR) ; \
-	done
-	$(CPPUTEST_HOME)/scripts/filterGcov.sh $(GCOV_OUTPUT) $(GCOV_ERROR) $(GCOV_REPORT) $(TEST_OUTPUT)
-	cat $(GCOV_REPORT)
- 
-.PHONEY: format
-format: 
-	$(CPPUTEST_HOME)/scripts/reformat.sh $(PROJECT_HOME_DIR)
-	
-debug:
-	echo Stuff to clean
-	$(SILENCE)for f in $(STUFF_TO_CLEAN) ; do \
-		echo "$$f" ; \
-	done
-	echo Includes
-	$(SILENCE)for i in $(INCLUDES) ; do \
-		echo "$$i" ; \
-	done
-	

xcoll-0.6.0/xcoll/scattering_routines/fluka/flukaio/Makefile

@@ -1,144 +0,0 @@
-#Set this to @ to keep the makefile quiet
-SILENCE = @
-
-#---- Outputs ----#
-COMPONENT_NAME = FlukaIO
-TARGET_LIB = \
-	lib/lib$(COMPONENT_NAME).a
-TARGET_SHARED_LIB = \
-	lib/lib$(COMPONENT_NAME).so
-
-TEST_TARGET = \
-	$(COMPONENT_NAME)_tests
-
-ifeq ($(BUILD64), Y)
-	TARGET_SUFFIX = 64
-	CPPUTEST_CPPFLAGS += -m64
-	G77FLAGS += -m64
-endif
-ifeq ($(BUILD32), Y)
-	TARGET_SUFFIX = 32
-	CPPUTEST_CPPFLAGS += -m32
-	CPPUTEST_LDFLAGS += -m32
-	G77FLAGS += -m32
-endif
-
-COMPONENT_NAME = FlukaIO
-TARGET_LIB = \
-	lib/lib$(COMPONENT_NAME)$(TARGET_SUFFIX).a
-TARGET_SHARED_LIB = \
-	lib/lib$(COMPONENT_NAME)$(TARGET_SUFFIX).so
-
-TEST_TARGET = \
-	$(COMPONENT_NAME)$(TARGET_SUFFIX)_tests
-
-#--- Inputs ----#
-PROJECT_HOME_DIR = .
-#CPPUTEST_HOME = /home/dsinuela/src/cpputest
-CPP_PLATFORM = Gcc
-
-# in case of Ubuntu 16.04, comment out -Werror
-WARNINGFLAGS = -Wall -Wswitch-default -Wswitch-enum -Werror 
-#CPPUTEST_CFLAGS are set to override malloc and free to get memory leak detection in C programs
-#CPPUTEST_CFLAGS = -Dmalloc=cpputest_malloc -Dfree=cpputest_free
-#GCOVFLAGS = -fprofile-arcs -ftest-coverage
-
-CPPUTEST_CPPFLAGS += $(WARNINGFLAGS)
-CPPUTEST_CPPFLAGS += -g
-CPPUTEST_CPPFLAGS += -fpic
-#CPPUTEST_CPPFLAGS += -DFLUKAIO_NODELAY
-
-G77 = gfortran
-G77FLAGS += $(WARNINGFLAGS)
-G77FLAGS += -g
-
-#SRC_DIRS is a list of source directories that make up the target library
-#If test files are in these directories, their IMPORT_TEST_GROUPs need
-#to be included in main to force them to be linked in.  By convention
-#put them into an AllTests.h file in each directory
-SRC_DIRS = \
-	src
-
-#TEST_SRC_DIRS is a list of directories including 
-# - A test main (AllTests.cpp by conventin)
-# - OBJ files in these directories are included in the TEST_TARGET
-# - Consequently - AllTests.h containing the IMPORT_TEST_GROUPS is not needed
-# - 
-TEST_SRC_DIRS = \
-	tests \
-	tests/fakes
-
-#includes for all compiles
-INCLUDES =\
-	-I.\
-	-Iinclude
-#	-I$(CPPUTEST_HOME)/include\
-
-#Flags to pass to ld
-USER_LIBS =
-LD_LIBRARIES += -lstdc++
-
-include ComponentMakefile
-
-all: $(TARGET_LIB) $(TARGET_SHARED_LIB)
-
-libs: $(TARGET_LIB) $(TARGET_SHARED_LIB)
-
-$(TARGET_SHARED_LIB): $(OBJ)
-	$(SILENCE)echo Building archive $@
-	$(SILENCE)$(CC) --version
-	$(SILENCE)echo command $(CC) $(LDFLAGS) -shared -o $@ $^
-	$(SILENCE)mkdir -p lib
-	$(SILENCE)$(CC) $(LDFLAGS) -shared -o $@ $^
-
-STUFF_TO_CLEAN += $(TARGET_SHARED_LIB)
-
-# Samples
-
-.PHONY: clean_samples
-
-clean_samples:
-	rm -rf samples/{ServerTest,ClientTest,fserver,fclient}
-
-samples: ServerTest ClientTest fserver fclient
-
-ServerTest: samples/ServerTest.c $(TARGET_LIB)
-	$(CC) $^ $(CPPFLAGS) -I./include -o samples/$@
-
-ClientTest: samples/ClientTest.c $(TARGET_LIB)
-	$(CC) $^ $(CPPFLAGS) -I./include -o samples/$@
-
-fserver: samples/fserver.f $(TARGET_LIB)
-	$(G77) $^ $(G77FLAGS) -o samples/$@
-
-fclient: samples/fclient.f $(TARGET_LIB)
-	$(G77) $^ $(G77FLAGS) -o samples/$@
-
-STUFF_TO_CLEAN += samples/ServerTest
-STUFF_TO_CLEAN += samples/ClientTest
-STUFF_TO_CLEAN += samples/fserver
-STUFF_TO_CLEAN += samples/fclient
-
-# Documentation
-
-.PHONY: doc
-
-doc:
-	@echo Making documentation
-	$(SILENCE)doxygen doc/Doxyfile 1> doxygen.log
-	#@$(RM) doxygen.log
-	cd doc; make
-
-STUFF_TO_CLEAN += doc/html doxygen.log
-
-show:
-	@echo "CPPFLAGS=$(CPPFLAGS)"
-	@echo "LDFLAGS=$(LDFLAGS)"
-
-.PHONY: clean_all
-
-clean_all:
-	$(SILENCE)echo "Making clean_all"
-	$(SILENCE)make clean BUILD32=Y > /dev/null
-	$(SILENCE)make clean BUILD64=Y > /dev/null
-

xcoll-0.6.0/xcoll/scattering_routines/fluka/flukaio/README

@@ -1,26 +0,0 @@
-FlukaIO 
-=======
-
-How to compile
-==============
-
-In a machine with CppUTest correctly configured, it can be compiled and tested running "make".
-
-In a machine without CppUTest both 32 and 64 bit versions of the libraries can be compiled issuing the following commands:
-
-make libs BUILD32=Y
-make clean
-make libs BUILD64=Y
-
-The resulting libraries will be compiled under the directory "lib".
-
-Documentation
-=============
-
-The doxygen documentation can be generated with the command "make doc"
-
-Compiling samples
-=================
-
-Run "make samples" to compile sample clients and servers under samples directory.
-