Skip to content

Commit d6ca8ab

Browse files
committed
SPF33ShieldA added
1 parent bc100b5 commit d6ca8ab

File tree

6 files changed

+28
-5
lines changed

6 files changed

+28
-5
lines changed

Model/MaxIV/Linac/Segment33.cxx

+4
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
#include "YagUnit.h"
7575
#include "YagScreen.h"
7676
#include "Bellows.h"
77+
#include "LocalShielding.h"
7778

7879
#include "LObjectSupportB.h"
7980
#include "TDCsegment.h"
@@ -89,6 +90,7 @@ Segment33::Segment33(const std::string& Key) :
8990
TDCsegment(Key,2),
9091

9192
pipeA(new constructSystem::VacuumPipe(keyName+"PipeA")),
93+
shieldA(new tdcSystem::LocalShielding(keyName+"ShieldA")),
9294
cMagHA(new xraySystem::CorrectorMag(keyName+"CMagHA")),
9395
bpm(new tdcSystem::StriplineBPM(keyName+"BPMA")),
9496
pipeB(new constructSystem::VacuumPipe(keyName+"PipeB")),
@@ -109,6 +111,7 @@ Segment33::Segment33(const std::string& Key) :
109111
ModelSupport::objectRegister::Instance();
110112

111113
OR.addObject(pipeA);
114+
OR.addObject(shieldA);
112115
OR.addObject(cMagHA);
113116
OR.addObject(bpm);
114117
OR.addObject(pipeB);
@@ -145,6 +148,7 @@ Segment33::buildObjects(Simulation& System)
145148
if (isActive("front"))
146149
pipeA->copyCutSurf("front",*this,"front");
147150
pipeA->createAll(System,*this,0);
151+
pipeMagUnit(System,*buildZone,pipeA,"#front","outerPipe",shieldA);
148152
pipeMagUnit(System,*buildZone,pipeA,"#front","outerPipe",cMagHA);
149153
pipeTerminate(System,*buildZone,pipeA);
150154

Model/MaxIV/Linac/linacVariables.cxx

+9
Original file line numberDiff line numberDiff line change
@@ -2273,6 +2273,15 @@ Segment33(FuncDataBase& Control,
22732273

22742274
setBellow26(Control,lKey+"Bellow",7.5);
22752275

2276+
// Local shielding wall
2277+
// http://localhost:8080/maxiv/work-log/tdc/pictures/spf-hall/img_5388.mp4/view
2278+
setVariable::LocalShieldingGenerator ShieldGen;
2279+
ShieldGen.setSize(10,80,35);
2280+
ShieldGen.setMidHoleSize(3.0,5.0);
2281+
ShieldGen.setCornerSize(0.0,0.0);
2282+
ShieldGen.generate(Control,lKey+"ShieldA");
2283+
Control.addVariable(lKey+"ShieldAYStep",14.0);
2284+
22762285
return;
22772286
}
22782287

Model/MaxIV/LinacInc/Segment33.h

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
namespace tdcSystem
2626
{
2727
class StriplineBPM;
28+
class LocalShielding;
29+
2830
/*!
2931
\class Segment33
3032
\version 1.0
@@ -40,6 +42,7 @@ class Segment33 :
4042

4143
// first pipe
4244
std::shared_ptr<constructSystem::VacuumPipe> pipeA;
45+
std::shared_ptr<tdcSystem::LocalShielding> shieldA; // local shielding
4346

4447
/// corrector mag
4548
std::shared_ptr<xraySystem::CorrectorMag> cMagHA;

materials.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@
2525

2626
#declare matCopper = texture { pigment{color rgb<0.969028364,0.0335801908,0.244655676> } };
2727

28-
#declare matLead = texture { pigment{color P_Chrome2} };
28+
#declare matLead = texture { pigment{color P_Chrome2 transmit 0.4 } };

povray/tdc.pov

+8-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
// 1=panoramic - good to display whole beam line
1818
// 2=omnimax
1919
// 3=cylindrical
20-
#declare projection = 0;
20+
#declare projection = 1;
2121
#declare cameraAngle = 150;
2222

23-
#declare quick=0; // 0=quick but low quality, 1=slow but somewhat better quality
23+
#declare quick=1; // 0=quick but low quality, 1=slow but somewhat better quality
2424
// another possibility to affect speed is command argument -q0 ... -q11
2525
// so one can set quick=0 and play with -q0
2626

@@ -445,6 +445,12 @@ global_settings {
445445
#declare projection = 0;
446446
#declare cameraAngle = 50;
447447
#break
448+
#case(strcmp(ITEM,"SPF33ShieldA")) // local shielding at SPF33 - img_5389.mp4
449+
#declare cameraLocation = <-750, 6200, 20>;
450+
#declare cameraLookAt = <-690, 6100, 0>;
451+
#declare projection = 0;
452+
#declare cameraAngle = 50;
453+
#break
448454
#else // whole beamline view (like All)
449455
#declare cameraLocation = <-500, 5200, 1000>;
450456
#declare cameraLookAt = <-600, 5100, 0>;

povray/tdc.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ fi
2323
void=""
2424
if [ $1 != " " ]; then # we build the beam line, therefore remove the InjectionHall walls
2525
void=" -v InjectionHallFloorMat Void -v InjectionHallRoofMat Void -v InjectionHallWallMat Void "
26-
void+="-v InjectionHallPillarMat Void -v InjectionHallBTGMat Void -v InjectionHallSoilMat Void "
27-
void+="-v InjectionHallBackWallMat Void -v InjectionHallWallIronMat Void "
26+
void+=" -v InjectionHallPillarMat Void -v InjectionHallBTGMat Void -v InjectionHallSoilMat Void "
27+
void+=" -v InjectionHallBackWallMat Void -v InjectionHallWallIronMat Void "
28+
void+=" -v InjectionHallTHzMat Void "
2829
fi
2930

3031
./maxiv -defaultConfig LINAC ${segments} -povray $void a \

0 commit comments

Comments
 (0)