diff options
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/Accelerator.cc | 36 | ||||
-rw-r--r-- | src/main/Accelerator.h | 7 | ||||
-rw-r--r-- | src/main/FODO.h | 2 | ||||
-rw-r--r-- | src/main/doxygen.h | 1 |
4 files changed, 28 insertions, 18 deletions
diff --git a/src/main/Accelerator.cc b/src/main/Accelerator.cc index 01f4f90..400ab0d 100644 --- a/src/main/Accelerator.cc +++ b/src/main/Accelerator.cc @@ -13,28 +13,30 @@ namespace vhc { std::string Accelerator::toString() const { std::stringstream s; + if (elementCollec.size() == 0) { s << "This accelerator doesn't contain anything."<<"\n"; - } else if (elementCollec.size()==1) { - s << "This accelerator is made of the following element :" << "\n"; - s << elementCollec[0]->toString()<<"\n"; } else { - s << "This accelerator is made of the " << elementCollec.size() << " following elements :" << "\n"; - for (int i(0); i < elementCollec.size(); ++i){ - s << elementCollec[i]->toString() << "\n"; + if (elementCollec.size()==1) { + s << "This accelerator is made of the following element :" << "\n"; + s << elementCollec[0]->toString()<<"\n"; + } else { + s << "This accelerator is made of the " << elementCollec.size() << " following elements :" << "\n"; + for (int i(0); i < elementCollec.size(); ++i){ + s << elementCollec[i]->toString() << "\n"; + } } - } - - if (particleCollec.size() == 0) { - s << "This accelerator doesn't contain any particle." << "\n"; - } else if (particleCollec.size() == 1) { - s << "This accelerator contains the following particle :" << "\n"; - s << particleCollec[0]->toString() << "\n"; - }else{ - s << "This accelerator contains the " << particleCollec.size() << " following particles :"<<"\n"; - for (int i(0); i < particleCollec.size(); ++i){ - s << particleCollec[i]->toString() << "\n"; + if (particleCollec.size() == 0) { + s << "This accelerator doesn't contain any particle." << "\n"; + } else if (particleCollec.size() == 1) { + s << "This accelerator contains the following particle :" << "\n"; + s << particleCollec[0]->toString() << "\n"; + }else{ + s << "This accelerator contains the " << particleCollec.size() << " following particles :"<<"\n"; + for (int i(0); i < particleCollec.size(); ++i){ + s << particleCollec[i]->toString() << "\n"; + } } } diff --git a/src/main/Accelerator.h b/src/main/Accelerator.h index 60e8ed9..a8d1562 100644 --- a/src/main/Accelerator.h +++ b/src/main/Accelerator.h @@ -18,7 +18,7 @@ namespace vhc { /** Représente un accélérateur. Cette classe contient en particulier une méthode * qui fait évoluer les particules qu'elle contient. */ -class Accelerator { +class Accelerator: public Printable{ private : /** Constructeur de copie ne faisant rien. */ @@ -128,6 +128,11 @@ public: } + void* stepMonteCarlo(); + + void* stepDeterministBackUp(); + + void* stepDeterminist(); }; diff --git a/src/main/FODO.h b/src/main/FODO.h index 4d61ad3..5b00ca6 100644 --- a/src/main/FODO.h +++ b/src/main/FODO.h @@ -15,6 +15,8 @@ namespace vhc { +/** Représente une maille FODO, qui est un élément magnétique droit, composé d'un quadrupôle, d'une section droite, d'un autre quadrupôle «opposé», et d'une autre section droite. + */ class FODO: public CompositeElement { private: diff --git a/src/main/doxygen.h b/src/main/doxygen.h index 1fbbd68..4397335 100644 --- a/src/main/doxygen.h +++ b/src/main/doxygen.h @@ -9,6 +9,7 @@ /**@mainpage * Page principale. + * <b>tchigidididi</b> * */ |