Skip to content

Commit 8bc7cc1

Browse files
kbatkbat
committed
WIP: updating the main beam dump room roof
1 parent 889e422 commit 8bc7cc1

File tree

4 files changed

+56
-18
lines changed

4 files changed

+56
-18
lines changed

‎Model/MaxIV/Linac/InjectionHall.cxx

+40-12
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ InjectionHall::populate(const FuncDataBase& Control)
223223
bdRoomHeight=Control.EvalVar<double>(keyName+"BDRoomHeight");
224224
bdRoomLength=Control.EvalVar<double>(keyName+"BDRoomLength");
225225
bdRoomFloorThick=Control.EvalVar<double>(keyName+"BDRoomFloorThick");
226-
bdRoomRoofThick=Control.EvalVar<double>(keyName+"BDRoomRoofThick");
226+
bdRoomRoofConcreteThick=Control.EvalVar<double>(keyName+"BDRoomRoofConcreteThick");
227+
bdRoomRoofSteelThick=Control.EvalVar<double>(keyName+"BDRoomRoofSteelThick");
227228
bdRoomRoofSteelWidth=Control.EvalVar<double>(keyName+"BDRoomRoofSteelWidth");
228229
bdRoomFrontWallThick=Control.EvalVar<double>(keyName+"BDRoomFrontWallThick");
229230
bdRoomSideWallThick=Control.EvalVar<double>(keyName+"BDRoomSideWallThick");
@@ -561,9 +562,12 @@ InjectionHall::createSurfaces()
561562
ModelSupport::buildShiftedPlane(SMap,buildIndex+7501,buildIndex+21,Y,
562563
-(bdRoomLength+bdRoomFrontWallThick));
563564
ModelSupport::buildShiftedPlane(SMap,buildIndex+7505,buildIndex+5,Z,
564-
-(bdRoomRoofThick+bdRoomHeight+bdRoomFloorThick));
565+
-(bdRoomRoofSteelThick+bdRoomRoofConcreteThick+bdRoomHeight+bdRoomFloorThick));
565566
ModelSupport::buildShiftedPlane(SMap,buildIndex+7506,buildIndex+7505,Z,bdRoomFloorThick);
566-
ModelSupport::buildShiftedPlane(SMap,buildIndex+7516,buildIndex+5,Z,-bdRoomRoofThick);
567+
ModelSupport::buildShiftedPlane(SMap,buildIndex+7515,buildIndex+5,Z,
568+
-bdRoomRoofConcreteThick);
569+
ModelSupport::buildShiftedPlane(SMap,buildIndex+7516,buildIndex+7515,Z,
570+
-bdRoomRoofSteelThick);
567571
ModelSupport::buildShiftedPlane(SMap,buildIndex+7511,buildIndex+7501,Y,bdRoomFrontWallThick);
568572
ModelSupport::buildShiftedPlane(SMap,buildIndex+7512,buildIndex+7511,Y,bdRoomHatchLength);
569573
ModelSupport::buildShiftedPlane(SMap,buildIndex+7522,buildIndex+7511,Y,
@@ -1227,34 +1231,58 @@ InjectionHall::createObjects(Simulation& System)
12271231
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -21 7513 -7503 7506 -15");
12281232
makeCell("BDSideWall",System,cellIndex++,wallMat,0.0,HR);
12291233

1230-
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -21 7503 -7543 -5 7516");
1234+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -21 7503 -7543 7515 -5");
12311235
makeCell("BDRoof",System,cellIndex++,floorMat,0.0,HR);
12321236

1233-
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7512 -21 7543 -7544 -5 7516");
1237+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7512 -21 7543 -7544 7515 -5");
12341238
makeCell("BDRoof",System,cellIndex++,bdRoofIronMat,0.0,HR);
12351239

1236-
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -7512 7543 -7544 -5 7516");
1240+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -7512 7503 -7544 7516 -7515");
1241+
makeCell("HatchNew",System,cellIndex++,voidMat,0.0,HR);
1242+
1243+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -7512 7543 -7544 7515 -5");
12371244
makeCell("HatchNew",System,cellIndex++,floorMat,0.0,HR);
12381245

1239-
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -21 7544 -7553 -5 7516");
1246+
1247+
1248+
1249+
1250+
1251+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -21 7544 -7553 7515 -5");
12401252
makeCell("BDRoof",System,cellIndex++,floorMat,0.0,HR);
12411253

1242-
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7512 -21 7553 -7554 -5 7516");
1254+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7512 -21 7503 -7504 7516 -7515");
1255+
makeCell("BDRoofSteel",System,cellIndex++,bdRoofIronMat,0.0,HR);
1256+
1257+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -7512 7544 -7553 7516 -7515");
1258+
makeCell("BDRoof",System,cellIndex++,voidMat,0.0,HR);
1259+
1260+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7512 -21 7553 -7554 7515 -5");
12431261
makeCell("BDRoofSPF",System,cellIndex++,bdRoofIronMat,0.0,HR);
12441262

1245-
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -7512 7553 -7554 -5 7516");
1263+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -7512 7553 -7554 7515 -5"); // this cell is cut by the entrance pipe
12461264
makeCell("HatchSPF",System,cellIndex++,floorMat,0.0,HR);
12471265

1248-
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -21 7554 -7563 -5 7516");
1266+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -7512 7553 -7554 7516 -7515"); // this cell is cut by the entrance pipe
1267+
makeCell("HatchSPF",System,cellIndex++,voidMat,0.0,HR);
1268+
1269+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -21 7554 -7563 -5 7515");
12491270
makeCell("BDRoof",System,cellIndex++,floorMat,0.0,HR);
12501271

1251-
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7512 -21 7563 -7564 -5 7516");
1272+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -7512 7554 -7563 7516 -7515");
1273+
makeCell("BDRoof",System,cellIndex++,voidMat,0.0,HR);
1274+
1275+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7512 -21 7563 -7564 7515 -5");
12521276
makeCell("BDRoof",System,cellIndex++,bdRoofIronMat,0.0,HR);
12531277

1278+
1279+
1280+
1281+
12541282
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -7512 7563 -7564 -5 7516");
12551283
makeCell("HatchTDC",System,cellIndex++,floorMat,0.0,HR);
12561284

1257-
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7512 -21 7564 -7504 -5 7516");
1285+
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7512 -21 7564 -7504 7515 -5");
12581286
makeCell("BDRoof",System,cellIndex++,floorMat,0.0,HR);
12591287

12601288
HR=ModelSupport::getHeadRule(SMap,buildIndex,"7511 -7512 7564 -7504 -5 7516");

‎Model/MaxIV/Linac/linacVariables.cxx

+6-3
Original file line numberDiff line numberDiff line change
@@ -2989,7 +2989,7 @@ Segment45(FuncDataBase& Control,
29892989

29902990
// floor gap
29912991
Control.addVariable(lKey+"CutRadius",20.0);
2992-
Control.addVariable(lKey+"XAngle",-24.97); // http://localhost:8080/maxiv/work-log/100-hz/main-beam-dump/dump7.pdf/view
2992+
Control.addVariable(lKey+"XAngle",-24.97); // dump7.pdf
29932993

29942994
setVariable::CeramicGapGenerator CSGen;
29952995
setVariable::YagUnitBigGenerator YagUnitGen;
@@ -3597,7 +3597,8 @@ wallVariables(FuncDataBase& Control,
35973597
Control.addVariable(bdRoom+"Height",200.0); // K_15-6_012 B-B
35983598
Control.addVariable(bdRoom+"Length",540); // K_15-6_011
35993599
Control.addVariable(bdRoom+"FloorThick",200.0); // K_15-6_012 B-B
3600-
Control.addVariable(bdRoom+"RoofThick",50.0); // K_15-6_011
3600+
Control.addVariable(bdRoom+"RoofConcreteThick",24.0); // K_24-6_010 and dump7.pdf
3601+
Control.addVariable(bdRoom+"RoofSteelThick",26.0); // K_24-6_010 and dump7.pdf
36013602
Control.addVariable(bdRoom+"RoofSteelWidth",140.0); // measured with ruler
36023603
Control.addVariable(bdRoom+"FrontWallThick",100.0); // K_15-6_011
36033604
Control.addVariable(bdRoom+"SideWallThick",200.0); // K_15-6_010
@@ -3648,7 +3649,6 @@ LINACvariables(FuncDataBase& Control)
36483649
{
36493650
ELog::RegMethod RegA("linacVariables[F]","LINACvariables");
36503651

3651-
ELog::EM<<"LINAC VARIABLES"<<ELog::endDiag;
36523652
linacVar::wallVariables(Control,"InjectionHall");
36533653

36543654
// Segment 1-14
@@ -3792,3 +3792,6 @@ LINACvariables(FuncDataBase& Control)
37923792
}
37933793

37943794
} // NAMESPACE setVariable
3795+
3796+
// References
3797+
// dump7.pdf: http://localhost:8080/maxiv/work-log/100-hz/main-beam-dump/dump7.pdf/view

‎Model/MaxIV/LinacInc/InjectionHall.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
* File: LinacInc/InjectionHall.h
55
*
6-
* Copyright (c) 2004-2022 by Stuart Ansell / Konstantin Batkov
6+
* Copyright (c) 2004-2023 by Stuart Ansell / Konstantin Batkov
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU General Public License as published by
@@ -154,7 +154,8 @@ class InjectionHall :
154154
double bdRoomHeight; ///< Under-the-floor beam dump room void height
155155
double bdRoomLength; ///< Beam dump room void length
156156
double bdRoomFloorThick; ///< Beam dump room floor thickness
157-
double bdRoomRoofThick; ///< Beam dump room steel roof thickness
157+
double bdRoomRoofConcreteThick; ///< Beam dump room roof concrete thickness
158+
double bdRoomRoofSteelThick; ///< Beam dump room roof steel thickness
158159
double bdRoomRoofSteelWidth; ///< Width of roof steel layers
159160
double bdRoomFrontWallThick; ///< Beam dump room front wall thickness
160161
double bdRoomSideWallThick; ///< Thickness of the beam dump room side walls

‎povray/tdc.pov

+7-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#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

@@ -626,6 +626,12 @@ global_settings {
626626
#declare cameraLookAt = <-350, 10000, 0>;
627627
#declare projection = 0;
628628
#declare cameraAngle = 50;
629+
#break
630+
#case(strcmp(ITEM,"MainBeamDump"))
631+
#declare cameraLocation = <-547, 9517, -292>;
632+
#declare cameraLookAt = <-741, 9697, -212>;
633+
#declare projection = 0;
634+
#declare cameraAngle = 90;
629635
#break
630636
#case(strcmp(ITEM,"NoRoof1")) // BC2 area
631637
#declare cameraLocation = <500, -1100, 1500>;

0 commit comments

Comments
 (0)