Skip to content

Commit dc75487

Browse files
kbatkbat
committed
FeMat -> PipeMat
1 parent a8d65bd commit dc75487

30 files changed

+36
-36
lines changed

‎Model/ESSBeam/bifrost/BIFROSTvariables.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ BIFROSTvariables(FuncDataBase& Control)
342342
Control.addVariable("bifrostCaveConcFloor",50.0);
343343
Control.addVariable("bifrostCaveConcBack",35.0);
344344

345-
Control.addVariable("bifrostCaveFeMat","Stainless304");
345+
Control.addVariable("bifrostCavePipeMat","Stainless304");
346346
Control.addVariable("bifrostCaveConcMat","Concrete");
347347

348348
// Beam port through front of cave

‎Model/ESSBeam/common/EssHut.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ EssHut::populate(const FuncDataBase& Control)
161161
concRoof=Control.EvalVar<double>(keyName+"ConcRoof");
162162
concBack=Control.EvalVar<double>(keyName+"ConcBack");
163163

164-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
164+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
165165
concMat=ModelSupport::EvalMat<int>(Control,keyName+"ConcMat");
166166

167167
return;

‎Model/ESSBeam/commonVar/PitGenerator.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ PitGenerator::generatePit(FuncDataBase& Control,const std::string& keyName,
169169
Control.addVariable(keyName+"FeWidth",feWidth);
170170
Control.addVariable(keyName+"FeFront",feFront);
171171
Control.addVariable(keyName+"FeBack",feBack);
172-
Control.addVariable(keyName+"FeMat",feMat);
172+
Control.addVariable(keyName+"PipeMat",feMat);
173173

174174
Control.addVariable(keyName+"ConcHeight",concHeight);
175175
Control.addVariable(keyName+"ConcDepth",concDepth);

‎Model/ESSBeam/dream/DREAMvariables.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ DREAMvariables(FuncDataBase& Control)
271271
Control.addVariable("dreamCaveConcFloor",50.0);
272272
Control.addVariable("dreamCaveConcBack",35.0);
273273

274-
Control.addVariable("dreamCaveFeMat","Stainless304");
274+
Control.addVariable("dreamCavePipeMat","Stainless304");
275275
Control.addVariable("dreamCaveConcMat","Concrete");
276276

277277

‎Model/ESSBeam/loki/LOKIvariables.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ LOKIvariables(FuncDataBase& Control)
255255
Control.addVariable("lokiCaveConcFloor",50.0);
256256
Control.addVariable("lokiCaveConcBack",35.0);
257257

258-
Control.addVariable("lokiCaveFeMat","Stainless304");
258+
Control.addVariable("lokiCavePipeMat","Stainless304");
259259
Control.addVariable("lokiCaveConcMat","Concrete");
260260

261261
PipeGen.generatePipe(Control,"lokiPipeOutC",150.0);

‎Model/ESSBeam/nnbar/DetectorChamber.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ DetectorChamber::populate(const FuncDataBase& Control)
109109
concRoof=Control.EvalVar<double>(keyName+"ConcRoof");
110110
concBack=Control.EvalVar<double>(keyName+"ConcBack");
111111

112-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
112+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
113113
concMat=ModelSupport::EvalMat<int>(Control,keyName+"ConcMat");
114114

115115
return;

‎Model/ESSBeam/nnbar/NNBARvariables.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ NNBARvariables(FuncDataBase& Control)
157157
Control.addVariable("nnbarCaveConcFloor",50.0);
158158
Control.addVariable("nnbarCaveConcBack",35.0);
159159

160-
Control.addVariable("nnbarCaveFeMat","Stainless304");
160+
Control.addVariable("nnbarCavePipeMat","Stainless304");
161161
Control.addVariable("nnbarCaveConcMat","Concrete");
162162

163163
// Beam port through front of cave

‎Model/ESSBeam/odin/Hut.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ Hut::populate(const FuncDataBase& Control)
184184
wallYStep=Control.EvalVar<double>(keyName+"WallYStep");
185185
wallThick=Control.EvalVar<double>(keyName+"WallThick");
186186

187-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
187+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
188188
concMat=ModelSupport::EvalMat<int>(Control,keyName+"ConcMat");
189189
wallMat=ModelSupport::EvalMat<int>(Control,keyName+"WallMat");
190190

‎Model/ESSBeam/odin/ODINvariables.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ ODINvariables(FuncDataBase& Control)
266266
Control.addVariable("odinCaveConcNoseSide",35.0);
267267
Control.addVariable("odinCaveConcBack",35.0);
268268

269-
Control.addVariable("odinCaveFeMat","CastIron");
269+
Control.addVariable("odinCavePipeMat","CastIron");
270270
Control.addVariable("odinCaveConcMat","Concrete");
271271

272272
// WALL for Hut
@@ -329,7 +329,7 @@ ODINvariables(FuncDataBase& Control)
329329
Control.addVariable("odinBeamStopInnerFeStep",35.0);
330330
Control.addVariable("odinBeamStopInnerCut",70.0);
331331

332-
Control.addVariable("odinBeamStopFeMat","CastIron");
332+
Control.addVariable("odinBeamStopPipeMat","CastIron");
333333
Control.addVariable("odinBeamStopConcMat","Concrete");
334334

335335
return;

‎Model/ESSBeam/odin/RentrantBS.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ RentrantBS::populate(const FuncDataBase& Control)
162162
innerCut=Control.EvalVar<double>(keyName+"InnerCut");
163163

164164

165-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
165+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
166166
concMat=ModelSupport::EvalMat<int>(Control,keyName+"ConcMat");
167167

168168
return;

‎Model/ESSBeam/vespa/VESPAvariables.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ VESPAvariables(FuncDataBase& Control)
323323
Control.addVariable("vespaCaveConcFloor",50.0);
324324
Control.addVariable("vespaCaveConcBack",35.0);
325325

326-
Control.addVariable("vespaCaveFeMat","Stainless304");
326+
Control.addVariable("vespaCavePipeMat","Stainless304");
327327
Control.addVariable("vespaCaveConcMat","Concrete");
328328

329329
// INNER Comp:
@@ -346,7 +346,7 @@ VESPAvariables(FuncDataBase& Control)
346346
Control.addVariable("vespaInnerConcRoof",10.0);
347347
Control.addVariable("vespaInnerConcFloor",50.0);
348348

349-
Control.addVariable("vespaInnerFeMat","Stainless304");
349+
Control.addVariable("vespaInnerPipeMat","Stainless304");
350350
Control.addVariable("vespaInnerConcMat","Concrete");
351351

352352
// Beam port through front of inner cave

‎Model/ESSBeam/vespa/VespaHut.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ VespaHut::populate(const FuncDataBase& Control)
109109
concRoof=Control.EvalVar<double>(keyName+"ConcRoof");
110110
concBack=Control.EvalVar<double>(keyName+"ConcBack");
111111

112-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
112+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
113113
concMat=ModelSupport::EvalMat<int>(Control,keyName+"ConcMat");
114114

115115
return;

‎Model/ESSBeam/vespa/VespaInner.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ VespaInner::populate(const FuncDataBase& Control)
114114
concRightWall=Control.EvalVar<double>(keyName+"ConcRightWall");
115115
concRoof=Control.EvalVar<double>(keyName+"ConcRoof");
116116

117-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
117+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
118118
concMat=ModelSupport::EvalMat<int>(Control,keyName+"ConcMat");
119119

120120
return;

‎Model/ESSBeam/vor/DHut.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ DHut::populate(const FuncDataBase& Control)
104104
feThick=Control.EvalVar<double>(keyName+"PipeThick");
105105
concThick=Control.EvalVar<double>(keyName+"ConcThick");
106106

107-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
107+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
108108
concMat=ModelSupport::EvalMat<int>(Control,keyName+"ConcMat");
109109

110110
return;

‎Model/ESSBeam/vor/VORvariables.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ VORvariables(FuncDataBase& Control)
213213
Control.addVariable("vorCavePipeThick",25.0);
214214
Control.addVariable("vorCaveConcThick",35.0);
215215

216-
Control.addVariable("vorCaveFeMat","Stainless304");
216+
Control.addVariable("vorCavePipeMat","Stainless304");
217217
Control.addVariable("vorCaveConcMat","Concrete");
218218

219219

‎Model/MaxIV/commonBeam/MonoBox.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ MonoBox::populate(const FuncDataBase& Control)
150150
"Flange to small for "+keyName+" port B");
151151

152152
voidMat=ModelSupport::EvalDefMat(Control,keyName+"VoidMat",0);
153-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
153+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
154154

155155
return;
156156
}

‎Model/MaxIV/commonBeam/TwinPipe.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ TwinPipe::populate(const FuncDataBase& Control)
128128

129129

130130
voidMat=ModelSupport::EvalDefMat(Control,keyName+"VoidMat",0);
131-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
131+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
132132

133133
return;
134134
}

‎Model/MaxIV/commonGenerator/TwinPipeGenerator.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ TwinPipeGenerator::generateTwin(FuncDataBase& Control,
261261
Control.addVariable(keyName+"FlangeBLength",flangeBLength);
262262

263263
Control.addVariable(keyName+"VoidMat",voidMat);
264-
Control.addVariable(keyName+"FeMat",pipeMat);
264+
Control.addVariable(keyName+"PipeMat",pipeMat);
265265

266266
return;
267267

‎Model/t1Build/PlateTarget.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ PlateTarget::populate(const FuncDataBase& Control)
180180
(keyName+"BlockType"+std::to_string(i),1);
181181

182182

183-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
183+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
184184
taMat=ModelSupport::EvalMat<int>(Control,keyName+"TaMat");
185185
wMat=ModelSupport::EvalMat<int>(Control,keyName+"WMat");
186186
waterMat=ModelSupport::EvalMat<int>(Control,keyName+"WaterMat");

‎Model/t1Build/t1BaseVariables.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ TS1PlateTarget(FuncDataBase& Control)
218218
Control.addVariable("TPlateBPlateIOffset",2.95); // Backplate thickness
219219
Control.addVariable("TPlateBPlatePinRadius",0.4); // Backplate thickness
220220

221-
Control.addVariable("TPlateFeMat","Stainless304"); // Steel
221+
Control.addVariable("TPlatePipeMat","Stainless304"); // Steel
222222
Control.addVariable("TPlateWMat","Tungsten"); // Tungsten
223223
Control.addVariable("TPlateWTemp",600.0); // Tungsten Temp
224224
Control.addVariable("TPlateWaterMat","D2O"); // Water [D2O]
@@ -344,7 +344,7 @@ TS1BulletTarget(FuncDataBase& Control)
344344
Control.addVariable("BPlatesBPlateIOffset",2.95); // Backplate thickness
345345
Control.addVariable("BPlatesBPlatePinRadius",0.4); // Backplate thickness
346346

347-
Control.addVariable("BPlatesFeMat","Stainless304"); // Steel
347+
Control.addVariable("BPlatesPipeMat","Stainless304"); // Steel
348348
Control.addVariable("BPlatesWMat","Tungsten"); // Tungsten
349349
Control.addVariable("BPlatesWTemp",600.0); // Tungsten Temp
350350
Control.addVariable("BPlatesWaterMat","D2O"); // Water [D2O]

‎NonCompiledProjects/Model/epbBuild/EPBVariables.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ EPBVariables(FuncDataBase& Control)
9191
Control.addVariable("MagnetWidth",90.0);
9292
Control.addVariable("MagnetHeight",90.0);
9393
Control.addVariable("MagnetLength",180.0);
94-
Control.addVariable("MagnetFeMat",5);
94+
Control.addVariable("MagnetPipeMat",5);
9595
Control.addVariable("Magnet1SegIndex",3);
9696
Control.addVariable("Magnet1SegLen",2);
9797

@@ -112,7 +112,7 @@ EPBVariables(FuncDataBase& Control)
112112
Control.addVariable("FocusWidth",50.0);
113113
Control.addVariable("FocusHeight",50.0);
114114
Control.addVariable("FocusLength",100.0);
115-
Control.addVariable("FocusFeMat",3);
115+
Control.addVariable("FocusPipeMat",3);
116116

117117
Control.addVariable("Focus1SegIndex",4);
118118
Control.addVariable("Focus1SegLen",2);

‎NonCompiledProjects/Model/epbBuild/Magnet.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ Magnet::populate(const FuncDataBase& Control)
135135
height=Control.EvalTail<double>(keyName,baseName,"Height");
136136
width=Control.EvalTail<double>(keyName,baseName,"Width");
137137

138-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat",
139-
baseName+"FeMat");
138+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat",
139+
baseName+"PipeMat");
140140

141141
return;
142142
}

‎NonCompiledProjects/zoom/ZoomCollimator.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ ZoomCollimator::populate(const FuncDataBase& Control)
185185
stackHeight=Control.EvalVar<double>(keyName+"StackHeight");
186186
stackWidth=Control.EvalVar<double>(keyName+"StackWidth");
187187

188-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
188+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
189189
waxMat=ModelSupport::EvalMat<int>(Control,keyName+"WaxMat");
190190

191191
nLayers=Control.EvalVar<size_t>(keyName+"NLayers");

‎NonCompiledProjects/zoom/ZoomPrimary.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ ZoomPrimary::populate(const FuncDataBase& Control)
168168
cutWidth=Control.EvalVar<double>(keyName+"CutWidth");
169169
cutHeight=Control.EvalVar<double>(keyName+"CutHeight");
170170

171-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
171+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
172172

173173
nLayers=Control.EvalVar<size_t>(keyName+"NLayers");
174174

‎NonCompiledProjects/zoom/ZoomVariables.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ ZoomVariables(const mainSystem::inputParam& IParam,
296296
Control.addVariable("zoomCollimatorRightInnerAngle",4.4);
297297
Control.addVariable("zoomCollimatorLeftWaxSkin",12.0);
298298
Control.addVariable("zoomCollimatorRightWaxSkin",12.0);
299-
Control.addVariable("zoomCollimatorFeMat","CastIron");
299+
Control.addVariable("zoomCollimatorPipeMat","CastIron");
300300
Control.addVariable("zoomCollimatorWaxMat","Poly"); // Cast steel
301301

302302

@@ -348,7 +348,7 @@ ZoomVariables(const mainSystem::inputParam& IParam,
348348
Control.addVariable("zoomPrimaryHeight",102.0);
349349
Control.addVariable("zoomPrimaryLeftWidth",90.3);
350350
Control.addVariable("zoomPrimaryRightWidth",90.3);
351-
Control.addVariable("zoomPrimaryFeMat","CastIron");
351+
Control.addVariable("zoomPrimaryPipeMat","CastIron");
352352
Control.addVariable("zoomPrimaryCutX",0.0);
353353
Control.addVariable("zoomPrimaryCutZ",0.0);
354354
Control.addVariable("zoomPrimaryCutWidth",25.0);

‎System/construct/ChopperPit.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ ChopperPit::populate(const FuncDataBase& Control)
164164
feFront=Control.EvalVar<double>(keyName+"FeFront");
165165
feBack=Control.EvalVar<double>(keyName+"FeBack");
166166

167-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
167+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
168168
concMat=ModelSupport::EvalMat<int>(Control,keyName+"ConcMat");
169169

170170
concHeight=Control.EvalVar<double>(keyName+"ConcHeight");

‎System/construct/CrossPipe.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ CrossPipe::populate(const FuncDataBase& Control)
165165
flangeLength=Control.EvalDefVar<double>(keyName+"FlangeLength",0.0);
166166

167167
voidMat=ModelSupport::EvalDefMat(Control,keyName+"VoidMat",0);
168-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
168+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
169169
plateMat=ModelSupport::EvalDefMat(Control,keyName+"PlateMat",feMat);
170170

171171
return;

‎System/construct/VacuumBox.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ VacuumBox::populate(const FuncDataBase& Control)
220220
"Flange to small for "+keyName+" port B");
221221

222222
voidMat=ModelSupport::EvalDefMat(Control,keyName+"VoidMat",0);
223-
feMat=ModelSupport::EvalMat<int>(Control,keyName+"FeMat");
223+
feMat=ModelSupport::EvalMat<int>(Control,keyName+"PipeMat");
224224

225225
return;
226226
}

‎System/constructVar/CrossGenerator.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ CrossGenerator::generateCross(FuncDataBase& Control,const std::string& keyName,
255255
Control.addVariable(keyName+"FlangeLength",(FL-VRad-wallThick)*0.9);
256256

257257
Control.addVariable(keyName+"VoidMat",voidMat);
258-
Control.addVariable(keyName+"FeMat",wallMat);
258+
Control.addVariable(keyName+"PipeMat",wallMat);
259259

260260
return;
261261

‎System/constructVar/VacBoxGenerator.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ VacBoxGenerator::generateBox(FuncDataBase& Control,const std::string& keyName,
379379
Control.addVariable(keyName+"FlangeBLength",flangeBLen);
380380

381381
Control.addVariable(keyName+"VoidMat",voidMat);
382-
Control.addVariable(keyName+"FeMat",wallMat);
382+
Control.addVariable(keyName+"PipeMat",wallMat);
383383
Control.addVariable(keyName+"WallMat",wallMat);
384384

385385
return;

0 commit comments

Comments
 (0)