Commit b9a62253 authored by Christof Metzger-Kraus's avatar Christof Metzger-Kraus
Browse files

fixing all occurrences of MATER

parent f12d2c42
......@@ -77,8 +77,8 @@ The following attributes are allowed on all elements:
Attach wakefield that was defined using the \keyword[sec:wakecmd]{WAKE} command.
\item[ELEMEDGE]
The edge of an element is specified in s coordinates in meters. This edge corresponds to the origin of the local coordinate system and is the physical start of the element. (Note that in general the fields will extend in front of this position.) The physical end of the element is determined by \keyword{ELEMEDGE} and its physical length. (Note again that in general the fields will extend past the physical end of the element.)
\item[PARTICLEMATERINTERACTION]
\TODO{Describe PARTICLEMATERINTERACTION}
\item[PARTICLEMATTERINTERACTION]
\TODO{Describe PARTICLEMATTERINTERACTION}
\item[X]
X-component of the position of the element in the laboratory coordinate system.
\item[Y]
......@@ -1777,9 +1777,9 @@ The vertical coordinate of the start point [\si{\milli\meter}]. Default value is
The vertical coordinate of the end point. [\si{\milli\meter}]. Default value is \SI{-100}{\milli\meter}.
\item[WIDTH]
The width of the septum. [\si{\milli\meter}]
\item[PARTICLEMATERINTERACTION]
\keyword{PARTICLEMATERINTERACTION} is an attribute of the element. Collimator physics is a only a kind of particlematerinteraction.
It can be applied to any element. If the type of \keyword{PARTICLEMATERINTERACTION} is \keyword{COLLIMATOR}, the material is defined here.
\item[PARTICLEMATTERINTERACTION]
\keyword{PARTICLEMATTERINTERACTION} is an attribute of the element. Collimator physics is a only a kind of particlematerinteraction.
It can be applied to any element. If the type of \keyword{PARTICLEMATTERINTERACTION} is \keyword{COLLIMATOR}, the material is defined here.
The material ``Cu", ``Be", ``Graphite" and ``Mo" are defined until now.
If this is not set, the particle matter interaction module will not be activated.
The particle hitting collimator will be recorded and directly deleted from the simulation.
......@@ -1813,9 +1813,9 @@ x3=0.0;
x4=0.0;
cmphys:particlematerinteraction, TYPE="Collimator", MATERIAL="Cu";
cma1: CCollimator, XSTART=x1, XEND=x2,YSTART=y1, YEND=y2,
ZSTART=2, ZEND=100, WIDTH=10.0, PARTICLEMATERINTERACTION=cmphys ;
ZSTART=2, ZEND=100, WIDTH=10.0, PARTICLEMATTERINTERACTION=cmphys ;
cma2: CCollimator, XSTART=x3, XEND=x4,YSTART=y3, YEND=y4,
ZSTART=2, ZEND=100, WIDTH=10.0, PARTICLEMATERINTERACTION=cmphys;
ZSTART=2, ZEND=100, WIDTH=10.0, PARTICLEMATTERINTERACTION=cmphys;
\end{example}
The particles lost on the CCOLLIMATOR are recorded in the ASCII file \filename{\textless inputfilename\textgreater.loss}
......@@ -1956,9 +1956,9 @@ Rectangular degrader with an overall length \keyword{L}.
\end{kdescription}
\noindent Example: Graphite degrader of \SI{15}{\centi\meter} thickness.
\begin{example}
DEGPHYS: PARTICLEMATERINTERACTION, TYPE="DEGRADER", MATERIAL="Graphite";
DEGPHYS: PARTICLEMATTERINTERACTION, TYPE="DEGRADER", MATERIAL="Graphite";
DEG1: DEGRADER, L=0.15, ELEMEDGE=0.02, OUTFN="DEG1.h5", PARTICLEMATERINTERACTION=DEGPHYS;
DEG1: DEGRADER, L=0.15, ELEMEDGE=0.02, OUTFN="DEG1.h5", PARTICLEMATTERINTERACTION=DEGPHYS;
\end{example}
......
......@@ -4,11 +4,11 @@ KX1IPHYS: ParticleMatterInteraction, TYPE="Collimator",MATERIAL="Copper";
KX2IPHYS: ParticleMatterInteraction, TYPE="Collimator",MATERIAL="Graphite";
KX0I: ECollimator, L=0.09, ELEMEDGE=0.01, APERTURE={0.003,0.003},OUTFN="KX0I.h5",
PARTICLEMATERINTERACTION='KX1IPHYS';
PARTICLEMATTERINTERACTION='KX1IPHYS';
FX5: Slit, L=0.09, ELEMEDGE=0.01, APERTURE={0.005,0.003},
PARTICLEMATERINTERACTION='KX2IPHYS';
PARTICLEMATTERINTERACTION='KX2IPHYS';
FX16: Slit, L=0.09, ELEMEDGE=0.01, APERTURE={-0.005,-0.003},
PARTICLEMATERINTERACTION='KX2IPHYS';
PARTICLEMATTERINTERACTION='KX2IPHYS';
......@@ -403,7 +403,7 @@ public:
Field_t rho_m;
/// vector field on the grid
VField_t eg_m;
VField_t eg_m;
/// avoid calls to Ippl::myNode()
int myNode_m;
......
#ifndef PARTICLEMATERINTERACTIONHANDLER_HH
#define PARTICLEMATERINTERACTIONHANDLER_HH
#ifndef PARTICLEMATTERINTERACTIONHANDLER_HH
#define PARTICLEMATTERINTERACTIONHANDLER_HH
#include <string>
#include "Algorithms/Vektor.h"
......@@ -62,4 +62,4 @@ inline
bool ParticleMatterInteractionHandler::getFlagAllParticlesIn() const {
return allParticleInMat_m;
}
#endif // PARTICLEMATERINTERACTION_HH
\ No newline at end of file
#endif // PARTICLEMATTERINTERACTION_HH
\ No newline at end of file
......@@ -97,7 +97,7 @@ unsigned long OpalBeamline::getFieldAt(const Vector_t &position,
// rtv |= BEAMLINE_WAKE;
// }
// if(section.hasParticleMatterInteraction()) {
// rtv |= BEAMLINE_PARTICLEMATERINTERACTION;
// rtv |= BEAMLINE_PARTICLEMATTERINTERACTION;
// }
return rtv;
......
......@@ -38,7 +38,7 @@ class Bend;
#define BEAMLINE_GEOM 0x30000000 // has geometry
#define BEAMLINE_WAKE 0x20000000 // has wake
#define BEAMLINE_BEND 0x10000000 // bends
#define BEAMLINE_PARTICLEMATERINTERACTION 0x08000000 // has particle mater interaction
#define BEAMLINE_PARTICLEMATTERINTERACTION 0x08000000 // has particle mater interaction
class OpalBeamline {
......
......@@ -110,8 +110,8 @@ void OpalCCollimator::update() {
coll->setOutputFN(Attributes::getString(itsAttr[OUTFN]));
coll->setCColl();
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*coll);
coll->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
......@@ -77,8 +77,8 @@ void OpalDegrader::update() {
deg->setOutputFN(Attributes::getString(itsAttr[OUTFN]));
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*deg);
deg->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
......@@ -89,8 +89,8 @@ void OpalDrift::update() {
drf->setWake(owk_m->wf_m);
}
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*drf);
drf->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
......@@ -86,8 +86,8 @@ void OpalECollimator::update() {
coll->setYsize(Attributes::getReal(itsAttr[YSIZE]));
coll->setOutputFN(Attributes::getString(itsAttr[OUTFN]));
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
const std::string matterDescriptor = Attributes::getString(itsAttr[PARTICLEMATERINTERACTION]);
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
const std::string matterDescriptor = Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION]);
ParticleMatterInteraction *orig = ParticleMatterInteraction::find(matterDescriptor);
parmatint_m = orig->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*coll);
......
......@@ -62,8 +62,8 @@ OpalElement::OpalElement(int size, const char *name, const char *help):
("APERTURE", "The element aperture");
itsAttr[WAKEF] = Attributes::makeString
("WAKEF", "Defines the wake function");
itsAttr[PARTICLEMATERINTERACTION] = Attributes::makeString
("PARTICLEMATERINTERACTION", "Defines the particle mater interaction handler");
itsAttr[PARTICLEMATTERINTERACTION] = Attributes::makeString
("PARTICLEMATTERINTERACTION", "Defines the particle mater interaction handler");
itsAttr[ORIGIN] = Attributes::makeRealArray
("ORIGIN", "The location of the element");
......@@ -114,7 +114,7 @@ OpalElement::OpalElement(int size, const char *name, const char *help):
registerStringAttribute("KEYWORD");
registerRealAttribute("L");
registerStringAttribute("WAKEF");
registerStringAttribute("PARTICLEMATERINTERACTION");
registerStringAttribute("PARTICLEMATTERINTERACTION");
registerStringAttribute("APERT");
registerRealAttribute("X");
registerRealAttribute("Y");
......@@ -393,7 +393,7 @@ const std::string OpalElement::getWakeF() const {
}
const std::string OpalElement::getParticleMatterInteraction() const {
const Attribute *attr = findAttribute("PARTICLEMATERINTERACTION");
const Attribute *attr = findAttribute("PARTICLEMATTERINTERACTION");
return attr ? Attributes::getString(*attr) : std::string();
}
......
......@@ -49,7 +49,7 @@ public:
LENGTH, // The element length.
ELEMEDGE, // The position of the element (in path length)
WAKEF, // The wake function to be used
PARTICLEMATERINTERACTION, // The particle mater interaction handler to be used
PARTICLEMATTERINTERACTION, // The particle mater interaction handler to be used
ORIGIN, // The location of the element in floor coordinates
ORIENTATION, // The orientation of the element (Tait Bryan angles)
X, // The x-coordinate of the location of the element in floor coordinates
......
......@@ -104,8 +104,8 @@ void OpalPepperPot::update() {
ppo->setPepperPot();
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*ppo);
ppo->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
......@@ -148,8 +148,8 @@ void OpalQuadrupole::update() {
quad->setNormalComponent(2, Attributes::getReal(itsAttr[K1]), Attributes::getReal(itsAttr[DK1]));
quad->setSkewComponent(2, Attributes::getReal(itsAttr[K1S]), Attributes::getReal(itsAttr[DK1S]));
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*quad);
quad->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
......@@ -221,8 +221,8 @@ void OpalRBend::update() {
else
bend->setK1(0.0);
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*bend);
bend->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
......@@ -152,8 +152,8 @@ void OpalRBend3D::update() {
bend->setWake(owk_m->wf_m);
}
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*bend);
bend->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
......@@ -86,8 +86,8 @@ void OpalRCollimator::update() {
coll->setOutputFN(Attributes::getString(itsAttr[OUTFN]));
coll->setRColl();
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*coll);
coll->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
......@@ -228,8 +228,8 @@ void OpalSBend::update() {
else
bend->setK1(0.0);
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*bend);
bend->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
......@@ -86,8 +86,8 @@ void OpalSlit::update() {
coll->setOutputFN(Attributes::getString(itsAttr[OUTFN]));
coll->setSlit();
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*coll);
coll->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
......@@ -93,8 +93,8 @@ void OpalWire::update() {
coll->setOutputFN(Attributes::getString(itsAttr[OUTFN]));
coll->setWire();
if(itsAttr[PARTICLEMATERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
if(itsAttr[PARTICLEMATTERINTERACTION] && parmatint_m == NULL) {
parmatint_m = (ParticleMatterInteraction::find(Attributes::getString(itsAttr[PARTICLEMATTERINTERACTION])))->clone(getOpalName() + std::string("_parmatint"));
parmatint_m->initParticleMatterInteractionHandler(*coll);
coll->setParticleMatterInteraction(parmatint_m->handler_m);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment