Skip to content
This repository has been archived by the owner on Feb 10, 2025. It is now read-only.

Commit

Permalink
Merged master from ilcsoft
Browse files Browse the repository at this point in the history
  • Loading branch information
pandreetto committed Jun 12, 2024
2 parents c76dea7 + 384e6dc commit 3a7c50d
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 937 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ LCIO ( **L**inear **C**ollider **I/O** ) is a persistency framework and event da
## Introduction

LCIO is intended to be used in both simulation studies and analysis frameworks. Its light weight and portability makes it also suitable for use in detector R&D
testbeam applications. It provides a C++ and optionally a Java implementation with a common interface (API) - a Fortran interface to the C++ implementation also exists,
if built with ROOT, Python bindings are available .
testbeam applications. It provides a C++ and optionally a Java implementation with a common interface (API) - if built with ROOT, Python bindings are available .

Using a common persistency format and event data model allows to easily share results and compare reconstruction algorithms.
LCIO is used by almost all groups involved in linear collider detector studies and thus has become a de facto standard.
Expand Down
26 changes: 0 additions & 26 deletions cmake/ilcsoft_build_32bit_compatible.cmake

This file was deleted.

1 change: 0 additions & 1 deletion cmake/ilcsoft_default_settings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ INCLUDE( ilcsoft_default_library_versioning )
INCLUDE( ilcsoft_default_build_output_directories )
INCLUDE( ilcsoft_default_rpath_settings )
INCLUDE( ilcsoft_default_cxx_flags )
#INCLUDE( ilcsoft_build_32bit_compatible )


# uninstall target may only be created once per project
Expand Down
36 changes: 2 additions & 34 deletions cmake/manual.tex.in
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ analysis frameworks. Its light weight and portability makes it also suitable
for use in detector R\&D applications.

It provides a C++ and a Java implementation with a common interface (API).
A Fortran interface to the C++ implementation is provided as well.

This manual is intended for application developers that want to incorporate LCIO in their
programs. This includes e.g. simulation developers as well as physicists that want to
Expand Down Expand Up @@ -231,11 +230,6 @@ Both ways of building LCIO will create the following libraries and executables:
lcio_event_counter
stdhepjob

./bin <-- f77 examples
anajob_F
simjob_F
recjob_F

\end{verbatim}


Expand Down Expand Up @@ -310,8 +304,6 @@ This section gives an introduction on how to use LCIO. We describe the user inte
provide some code examples. For most of the section we focus on Java and C++ as these are the main
languages supported by LCIO. Thanks to the AID~\cite{ref_aid} tool Java and C++ hava an API which is generated
from a common source and thus very similar.
The Fortran interface, implemented as a wrapper to the C++ implementation, is described
in \ref{f77api}.

\subsection{Java and C++ API} \label{sec_api}
Detailed documentation of the API is provided both for Java and C++ on the
Expand Down Expand Up @@ -1009,16 +1001,13 @@ Of course if you use your own implementation of the EVENT interface you are also
memory management.}



\input{f77api}

\section{Real world examples} \label{realworld}
All the examples described above show how to use LCIO with Java, C++ and Fortran. They are build
All the examples described above show how to use LCIO with Java and C++. They are build
with LCIO and provided as binaries in \verb#$LCIO/bin#.
%$
We also provide some examples that show how to use LCIO with some common physiscs simulation
and analysis packages, such as {\em Pythia, Root and AIDA (JAS)} in
\verb#$LCIO/examples/java[cpp,f77]#.
\verb#$LCIO/examples/java[cpp]#.
%$
As these examples depend on external tools and libraries they are not build by default with LCIO.
Please check the corresponding \verb$README$ files for instructions on how to build these examples:
Expand All @@ -1037,23 +1026,6 @@ This Java example creates an AIDA file from an LCIO file with some histograms
and an Ntuple. You can use any AIDA~\cite{ref_aida} compliant analysis tools for
viewing the histograms, e.g. JAS3~\cite{ref_jas}.

\subsection{lciohbook (Fortran, Hbook)} \label{rwhbook}

A Fortran example that creates an Hbook~\cite{ref_cernlib} file from an LCIO file with
some histograms to be analyzed with PAW~\cite{ref_cernlib}.

\subsection{pythia (Fortran, Pythia)} \label{rwpythia}

An ASCII file of generator output can be produced by the script \verb$pythiahepevt.sh$.
This script runs a Pythia~\cite{ref_pythia} job
using the Pythia routine {\bf PYHEPC} to fill the \verb$hepevt$ common block
and a modified version of {\bf LCWRITE} to create the ASCII file (is included in the script). To run this script
one has to provide \verb$cernlib$~\cite{ref_cernlib} 2002 or later. The script has to be modified if necessary
to provide a valid path to the \verb$cernlib$ libraries. \\
The program {\bf PYSIMJOB} (\verb$pysimjob.F$) reads the ASCII file, fills the \verb$hepevt$ common
block, and writes a LCIO file which is read again in a second pass to fill the \verb$hepevt$ common
block.


\newpage
%\begin{latexonly}
Expand Down Expand Up @@ -1158,10 +1130,6 @@ See UTIL::LCStdHepRdr and EXAMPLES/stdhepjob.cc.
%{\footnotesize \verbatiminput{../../../doc/lcio.xml} }
%\newpage

\section{Summary of Fortran API Functions} \label{ftn_summary}

\input{f77summary.tex}


\newpage
% Create the reference section using BibTeX:
Expand Down
19 changes: 19 additions & 0 deletions doc/ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# v02-22

* 2024-06-07 tmadlener ([PR#189](https://github.com/iLCSoft/LCIO/pull/189))
- Remove mentions of the removed F77 API (see [#161](https://github.com/iLCSoft/LCIO/pull/161)) from the documentation

* 2024-06-06 tmadlener ([PR#190](https://github.com/iLCSoft/LCIO/pull/190))
- Remove the no longer used settings for the 32bit compatibility mode

* 2024-06-06 Nazar Bartosik ([PR#147](https://github.com/iLCSoft/LCIO/pull/147))
- Add `Nholes` and and `subdetectorHoleNumbers` to the `Track` for keeping track of missing hits in a Track.

* 2024-05-08 Bohdan Dudar ([PR#170](https://github.com/iLCSoft/LCIO/pull/170))
- Added new utility `dumpmctree` to draw the MC table of the event stored in the slcio file as the graphviz tree diagram, which represents parent-daughter relations visually in a easier way.
- `dumpmctree` is a small wrapper script around the actual `dumpmctree-dot` executable. The latter produces a `.dot` file which is then transformed into an `.svg` file via the wrapper script and the `dot` executable.
- The script relies on `dot` & `xdg-open` to be available on your system.

* 2024-04-15 tmadlener ([PR#188](https://github.com/iLCSoft/LCIO/pull/188))
- Make the `PIDHandler` usable as `const` object by marking getters that do not mutate internal state as `const`

# v02-21

* 2024-01-15 Thomas Madlener ([PR#187](https://github.com/iLCSoft/LCIO/pull/187))
Expand Down
Loading

0 comments on commit 3a7c50d

Please sign in to comment.