xcoll 0.6.1__tar.gz → 0.6.2__tar.gz

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

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: xcoll
-Version: 0.6.1
+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.6)
+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.1 → xcoll-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "xcoll"
-version = "0.6.1"
+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.6"
+xtrack = ">=0.84.8"
 
 [poetry.group.dev.dependencies]
 pytest = ">=7.3"

{xcoll-0.6.1 → 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.1'
+__version__ = '0.6.2'
 # ======================

xcoll-0.6.1/xcoll/__init__.py.orig

@@ -1,26 +0,0 @@
-# copyright ############################### #
-# This file is part of the Xcoll package.   #
-# Copyright (c) CERN, 2025.                 #
-# ######################################### #
-
-from .general import _pkg_root, __version__, citation
-
-<<<<<<< HEAD
-from .beam_elements import BlackAbsorber, BlackCrystal, EverestBlock, EverestCollimator, EverestCrystal, \
-                           Geant4Collimator, BlowUp, EmittanceMonitor, collimator_classes, crystal_classes, element_classes
-=======
-from .beam_elements import BlackAbsorber, BlackCrystal, TransparentCollimator, TransparentCrystal, \
-                           EverestBlock, EverestCollimator, EverestCrystal, BlowUp, EmittanceMonitor, \
-                           collimator_classes, crystal_classes, element_classes
->>>>>>> main
-from .scattering_routines.everest import materials, Material, CrystalMaterial
-from .scattering_routines.geant4 import Geant4Engine
-from .colldb import CollimatorDatabase
-from .interaction_record import InteractionRecord
-from .rf_sweep import RFSweep
-from .lossmap import LossMap, MultiLossMap
-
-
-# print("If you use Xcoll in your simulations, please cite us :-)")
-# print(citation)
-

xcoll-0.6.1/xcoll/general.py.orig

@@ -1,20 +0,0 @@
-# copyright ############################### #
-# This file is part of the Xcoll package.   #
-# Copyright (c) CERN, 2024.                 #
-# ######################################### #
-
-from pathlib import Path
-
-_pkg_root = Path(__file__).parent.absolute()
-
-citation = "F.F. Van der Veken, et al.: Recent Developments with the New Tools for Collimation Simulations in Xsuite, Proceedings of HB2023, Geneva, Switzerland."
-
-# ======================
-# Do not change
-# ======================
-<<<<<<< HEAD
-__version__ = '0.5.11.dev0+geant4'
-=======
-__version__ = '0.6.0'
->>>>>>> main
-# ======================

xcoll-0.6.1/xcoll/initial_distribution.py.orig

@@ -1,256 +0,0 @@
-# copyright ############################### #
-# This file is part of the Xcoll package.   #
-# Copyright (c) CERN, 2025.                 #
-# ######################################### #
-
-import numpy as np
-from warnings import warn
-
-import xtrack as xt
-import xobjects as xo
-import xpart as xp
-
-<<<<<<< HEAD
-from .beam_elements import collimator_classes, EverestCrystal, Geant4Collimator
-=======
-from .beam_elements import collimator_classes, BaseCrystal
->>>>>>> main
-
-
-def generate_pencil_on_collimator(line, name, num_particles, *, side='+-', pencil_spread=1e-6,
-                                  impact_parameter=0, sigma_z=7.61e-2, twiss=None, longitudinal=None,
-                                  longitudinal_betatron_cut=None, _capacity=None, tw=None,
-                                  _longitudinal_coords=None, **kwargs):
-    """Generate a pencil beam on a collimator."""
-
-    # Do some general checks
-    if not line._has_valid_tracker():
-        raise ValueError("Please build tracker before generating pencil distribution!")
-    coll = line[name]
-    if not isinstance(coll, tuple(collimator_classes)):
-        raise ValueError("Need to provide a valid collimator!")
-    if coll.optics is None:
-        raise ValueError("Need to assign optics to collimators before generating pencil distribution!")
-    num_particles = int(num_particles)
-    if len(line.get_elements_of_type(Geant4Collimator)[0]) > 0:
-        kwargs.setdefault('_capacity', 2*num_particles)
-
-    # Define the plane
-    angle = coll.angle
-    if abs(np.mod(angle-90,180)-90) < 1e-6:
-        plane = 'x'
-        transv_plane = 'y'
-    elif abs(np.mod(angle,180)-90) < 1e-6:
-        plane = 'y'
-        transv_plane = 'x'
-    else:
-        raise NotImplementedError("Pencil beam on a skew collimator not yet supported!")
-
-    if coll.side == 'left':
-        if side == '-':
-            raise ValueError("Cannot generate a pencil on the right jaw of a left-"
-                             "sided collimator!")
-        side = '+'
-    if coll.side == 'right':
-        if side == '+':
-            raise ValueError("Cannot generate a pencil on the left jaw of a right-"
-                             "sided collimator!")
-        side = '-'
-
-    if tw is not None:
-        warn("The argument tw is deprecated. Please use twiss instead.", FutureWarning)
-        if twiss is None:
-            twiss = tw
-
-    if twiss is None:
-        twiss = line.twiss()
-
-    # Longitudinal plane
-    if _longitudinal_coords:
-        zeta = _longitudinal_coords[0]
-        delta = _longitudinal_coords[1]
-
-    else:
-        zeta, delta = _generate_longitudinal_dist(line, num_particles, sigma_z, longitudinal)
-
-        # Generate 4D coordinates
-        # TODO: there is some looping in the calculation here and in xpart. Can it be improved?
-        if side == '+-':
-            num_plus = int(num_particles/2)
-            num_min  = int(num_particles - num_plus)
-            zeta_plus = zeta[:num_plus] if hasattr(zeta, '__iter__') else zeta
-            zeta_min  = zeta[num_plus:] if hasattr(zeta, '__iter__') else zeta
-            delta_plus = delta[:num_plus] if hasattr(delta, '__iter__') else delta
-            delta_min  = delta[num_plus:] if hasattr(delta, '__iter__') else delta
-            if _capacity:
-                _capacity_plus = int(_capacity/2)
-                _capacity_min  = int(_capacity - _capacity_plus)
-            else:
-                _capacity_plus = None
-                _capacity_min  = None
-            part_plus = generate_pencil_on_collimator(line=line, name=name, num_particles=num_plus,
-                                impact_parameter=impact_parameter, _capacity=_capacity_plus,
-                                side='+', pencil_spread=pencil_spread, twiss=twiss, 
-                                _longitudinal_coords=[zeta_plus, delta_plus],
-                                **kwargs)
-            part_min = generate_pencil_on_collimator(line=line, name=name, num_particles=num_min,
-                                impact_parameter=impact_parameter, _capacity=_capacity_min,
-                                side='-', pencil_spread=pencil_spread, twiss=twiss, 
-                                _longitudinal_coords=[zeta_min, delta_min],
-                                **kwargs)
-
-            part = xt.Particles.merge([part_plus, part_min])
-            part.start_tracking_at_element = part_plus.start_tracking_at_element
-            assert part.start_tracking_at_element == part_min.start_tracking_at_element
-            return part
-
-    pencil, p_pencil, transverse_norm, p_transverse_norm, is_converging, at_element = \
-                    _generate_4D_pencil_one_jaw(line, name, num_particles, plane, side,
-                                                impact_parameter, pencil_spread, twiss, **kwargs)
-
-    # Build the particles
-    if plane == 'x':
-        part = xp.build_particles(
-                x=pencil, px=p_pencil, y_norm=transverse_norm, py_norm=p_transverse_norm,
-                zeta=zeta, delta=delta, nemitt_x=coll.nemitt_x, nemitt_y=coll.nemitt_y,
-                line=line, at_element=at_element, _context=coll._buffer.context, **kwargs
-        )
-    else:
-        part = xp.build_particles(
-                x_norm=transverse_norm, px_norm=p_transverse_norm, y=pencil, py=p_pencil, 
-                zeta=zeta, delta=delta, nemitt_x=coll.nemitt_x, nemitt_y=coll.nemitt_y,
-                line=line, at_element=at_element, _context=coll._buffer.context, **kwargs
-        )
-
-    part._init_random_number_generator()
-
-    if not is_converging:
-        dri = xt.Drift(length=-coll.length)
-        dri.track(part)
-        part.start_tracking_at_element -= 1
-        part.at_element -= 1
-
-    return part
-
-
-def generate_delta_from_dispersion(line, at_element, *, plane, position_mm, nemitt_x, nemitt_y,
-                                   twiss=None, betatron_cut=0, match_at_front=True):
-    if line.tracker is None:
-        raise ValueError("Need to build tracker first!")
-    if not hasattr(betatron_cut, '__iter__'):
-        if hasattr(position_mm, '__iter__'):
-            betatron_cut = np.full_like(position_mm, betatron_cut)
-    elif not hasattr(position_mm, '__iter__'):
-        position_mm = np.full_like(betatron_cut, position_mm)
-    elif len(position_mm) != len(betatron_cut):
-        raise ValueError
-    if plane not in ['x', 'y']:
-        raise ValueError("The variable 'plane' needs to be either 'x' or 'y'!")
-
-    if twiss is None:
-        twiss = line.twiss()
-
-    beam_sizes = twiss.get_beam_covariance(nemitt_x=nemitt_x, nemitt_y=nemitt_y)
-    beam_sizes = beam_sizes.rows[at_element:f'{at_element}>>1'][f'sigma_{plane}']
-    sigma = beam_sizes[0] if match_at_front else beam_sizes[1]
-    delta  = (position_mm - betatron_cut*sigma - twiss.rows[at_element][plane])
-    delta /= twiss.rows[at_element][f'd{plane}']
-
-    return delta
-
-
-def _generate_4D_pencil_one_jaw(line, name, num_particles, plane, side, impact_parameter,
-                                pencil_spread, twiss=None, _capacity=None, **kwargs):
-    coll = line[name]
-    beam_sizes = twiss.get_beam_covariance(nemitt_x=coll.nemitt_x, nemitt_y=coll.nemitt_y)
-
-    # Is it converging or diverging?
-    # TODO: dispersion might change this
-    # TODO: skew collimators
-    tolerance_tilt = 1e-12 # 0.1 urad tolerance on jaw tilt  =>  we prioritise converging
-    divergence = coll.divergence
-    if side == '+':
-        if isinstance(coll, BaseCrystal):
-            # A pencil on the crystal should always be upstream
-            is_converging = True
-            pencil_pos = coll.jaw_U + impact_parameter
-        else:
-            betatron_angle = coll.gap_L * divergence
-            is_converging = coll.tilt_L + tolerance_tilt >= betatron_angle
-            print(f"Left jaw of collimator {name} is {'con' if is_converging else 'di'}verging.")
-            if is_converging:
-                pencil_pos = coll.jaw_LU + impact_parameter
-            else:
-                pencil_pos = coll.jaw_LD + impact_parameter
-    elif side == '-':
-        if isinstance(coll, BaseCrystal):
-            # A pencil on the crystal should always be upstream
-            is_converging = True
-            pencil_pos = coll.jaw_U - impact_parameter
-        else:
-            betatron_angle = coll.gap_R * divergence
-            is_converging = coll.tilt_R - tolerance_tilt <= betatron_angle
-            print(f"Right jaw of collimator {name} is {'con' if is_converging else 'di'}verging.")
-            if is_converging:
-                pencil_pos = coll.jaw_RU - impact_parameter
-            else:
-                pencil_pos = coll.jaw_RD - impact_parameter
-    else:
-        raise ValueError(f"Sinde {side} not supported in  _generate_4D_pencil_one_jaw!")
-
-    if is_converging:
-        # pencil at front of jaw
-        sigma = beam_sizes.rows[name:f'{name}>>1'][f'sigma_{plane}'][0]
-        tw_at_s = twiss.rows[name]
-        at_element = name
-    else:
-        # pencil at back of jaw
-        sigma = beam_sizes.rows[name:f'{name}>>1'][f'sigma_{plane}'][1]
-        tw_at_s = twiss.rows[f'{name}>>1']
-        at_element = line.element_names[line.element_names.index(name)+1]
-
-    dr_sigmas = pencil_spread/sigma
-
-    # Collimator plane: generate pencil distribution
-    pencil, p_pencil = xp.generate_2D_pencil_with_absolute_cut(
-                        num_particles, plane=plane, absolute_cut=pencil_pos, line=line,
-                        dr_sigmas=dr_sigmas, nemitt_x=coll.nemitt_x, nemitt_y=coll.nemitt_y,
-                        at_element=at_element, side=side, twiss=tw_at_s, **kwargs
-                       )
-
-    # Other plane: generate gaussian distribution in normalized coordinates
-    transverse_norm   = np.random.normal(size=num_particles)
-    p_transverse_norm = np.random.normal(size=num_particles)
-
-    return pencil, p_pencil, transverse_norm, p_transverse_norm, is_converging, at_element
-
-
-def _generate_longitudinal_dist(line, num_particles, sigma_z, longitudinal):
-    # TODO: make this more general, make this better
-    if longitudinal is None:
-        return 0, 0
-    elif longitudinal == 'matched_dispersion':
-        raise NotImplementedError
-        # if longitudinal_betatron_cut is None:
-        #     cut = 0
-        # else:
-        #     cut = np.random.uniform(-longitudinal_betatron_cut, longitudinal_betatron_cut,
-        #                             num_particles)
-        # delta = generate_delta_from_dispersion(line, name, plane=plane, position_mm=pencil,
-        #                                        nemitt_x=nemitt_x, nemitt_y=nemitt_y, twiss=tw,
-        #                                        betatron_cut=cut, match_at_front=is_converging)
-        # zeta  = 0
-    elif longitudinal == 'bucket':
-        return xp.generate_longitudinal_coordinates(
-                num_particles=num_particles, distribution='gaussian', sigma_z=sigma_z, line=line
-        )
-    elif not hasattr(longitudinal, '__iter__'):
-        raise ValueError
-    elif len(longitudinal) != 2:
-        raise ValueError
-    elif isinstance(longitudinal, str):
-        raise ValueError
-    elif isinstance(longitudinal, dict):
-        return longitudinal['zeta'], longitudinal['delta']
-    else:
-        return longitudinal[0], longitudinal[1]

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

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

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

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

xcoll-0.6.1/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.1/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
-