Skip to content

Commit 8eddfd7

Browse files
committed
added new dependency pandas
1 parent 5434274 commit 8eddfd7

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

ocelot/__init__.py

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,20 @@
3939
import numpy as np
4040
from ocelot.cpbd.magnetic_lattice import MagneticLattice, merger
4141

42-
from ocelot.cpbd.beam import ParticleArray, global_slice_analysis,Particle, Beam, Twiss, get_current, \
43-
get_envelope, generate_parray, ellipse_from_twiss
44-
45-
from ocelot.cpbd.optics import lattice_transfer_map, TransferMap, Navigator, twiss, get_map, MethodTM, \
46-
SecondTM, KickTM, CavityTM, UndulatorTestTM
47-
42+
from ocelot.cpbd.beam import *
43+
from ocelot.cpbd.optics import *
4844
from ocelot.cpbd.elements import *
49-
from ocelot.cpbd.match import match, match_tunes
45+
from ocelot.cpbd.match import *
5046
from ocelot.cpbd.track import *
51-
from ocelot.common.globals import pi, m_e_eV, m_e_MeV, m_e_GeV, speed_of_light
47+
from ocelot.common.globals import *
5248
from ocelot.common.ocelog import *
53-
from ocelot.cpbd.chromaticity import compensate_chromaticity
54-
from ocelot.cpbd.beam_params import EbeamParams
55-
from ocelot.cpbd.io import save_particle_array, load_particle_array, write_lattice
56-
from ocelot.cpbd.sc import SpaceCharge, LSC
57-
from ocelot.cpbd.csr import CSR
58-
from ocelot.cpbd.wake3D import Wake, WakeTable, WakeKick, WakeTableDechirperOffAxis
59-
60-
from ocelot.cpbd.physics_proc import BeamTransform, SmoothBeam, EmptyProc, PhysProc, LaserHeater, \
61-
LaserModulator, SpontanRadEffects, PhaseSpaceAperture
49+
from ocelot.cpbd.chromaticity import *
50+
from ocelot.cpbd.beam_params import *
51+
from ocelot.cpbd.io import *
52+
from ocelot.cpbd.sc import *
53+
from ocelot.cpbd.csr import *
54+
from ocelot.cpbd.wake3D import *
55+
from ocelot.cpbd.physics_proc import *
6256

6357

6458
print('initializing ocelot...')

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
setup(
1212
name='ocelot',
13-
version='20.04.0',
13+
version='20.04.1',
1414
description='Accelerator, radiation and x-ray optics simulation framework',
1515
author='ocelot-collab',
1616
author_email='tomin.sergey@gmail.com',
1717
url='https://github.com/ocelot-collab/ocelot',
1818
packages=all_packages,
1919
package_dir={'ocelot.demos': 'demos'}, ## install examples along with the rest of the source
2020
install_requires=[
21-
'numpy', 'scipy', 'matplotlib'
21+
'numpy', 'scipy', 'matplotlib', 'pandas'
2222
],
2323
package_data={'ocelot.optics': ['data/*.dat']},
2424
# long_description=open(join(dirname(__file__), 'README.txt')).read(),

0 commit comments

Comments
 (0)