diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2011-05-23 16:19:06 +0000 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2011-05-23 16:19:06 +0000 |
| commit | 4dfe6cc0636809542f525fdd86eaaa2af3181647 (patch) | |
| tree | 81e8cb8493b3e9a697970836e04dd21a27d58362 /src/gui | |
| parent | 2c8bb59d4ccca47c5342ee030f31e13c0cb2674b (diff) | |
| download | vhc-4dfe6cc0636809542f525fdd86eaaa2af3181647.tar.gz vhc-4dfe6cc0636809542f525fdd86eaaa2af3181647.tar.bz2 vhc-4dfe6cc0636809542f525fdd86eaaa2af3181647.zip | |
Ajout des bunchs :)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/Main.cc | 11 | ||||
| -rw-r--r-- | src/gui/Stage.cc | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/gui/Main.cc b/src/gui/Main.cc index 94f68ee..a5adee9 100644 --- a/src/gui/Main.cc +++ b/src/gui/Main.cc @@ -22,6 +22,7 @@ #include "constants.h" #include <vector> #include "CircularBeam.h" +#include "Bunch.h" using namespace std; using namespace vhc; @@ -143,7 +144,15 @@ Une particule : acc->add(ap1); acc->add(ap2); - acc->add(CircularBeam(p1, 10, 1)); + acc->add(CircularBeam(p1, 20, 1)); + + double emittance = 5E-6; //m + double A_12 = 0.02; //1/m + double A_22 = 4;//E-19; // s² m-1 (dépend totalement de l'accélérateur) + double length = 300E-12 * constants::C; + double stdDev = 0.1; + acc->add(Bunch(p1, 500, 1, stdDev, length, emittance, A_12, A_22)); + acc->add(Bunch(ap1, 500, 1, stdDev, length, emittance, A_12, A_22)); acc->close(); diff --git a/src/gui/Stage.cc b/src/gui/Stage.cc index 020f31a..4c0328d 100644 --- a/src/gui/Stage.cc +++ b/src/gui/Stage.cc @@ -25,7 +25,7 @@ Stage::Stage(QWidget* parent): particleRenderer(), displayMode(FILL), frameTime(0), - h(1E-11), + h(1E-12), paused(true) { timer = new QTimer(this); @@ -145,7 +145,7 @@ void Stage::paintGL() { camera.move(mv); - if (!paused) for (int i = 0; i < 10; ++i) accelerator->step(h); + if (!paused) for (int i = 0; i < 30; ++i) accelerator->step(h); glColor3d(1,1,0); util::crosshair(); |