Big update due to missing an OR in the all.sh

   This gets rid of the problme of stuff in most of the ESS bemaline

Author: SAnsell

Model/ESSBeam/beer/BEER.cxx

@@ -3,7 +3,7 @@
  
  * File:   ESSBeam/beer/BEER.cxx
  *
- * Copyright (c) 2004-2022 by Stuart Ansell
+ * Copyright (c) 2004-2023 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -93,6 +93,7 @@ namespace essSystem
 
 BEER::BEER(const std::string& keyName) :
   attachSystem::CopiedComp("beer",keyName),
+  attachSystem::ExternalCut(),        // extra for target cut
   stopPoint(0),
   beerAxis(new attachSystem::FixedRotateUnit(newName+"Axis",4)),
 
@@ -484,21 +485,23 @@ BEER::build(Simulation& System,
    */
 {
   ELog::RegMethod RegA("BEER","build");
-  
-  
 
   const FuncDataBase& Control=System.getDataBase();
   CopiedComp::process(System.getDataBase());
   stopPoint=Control.EvalDefVar<int>(newName+"StopPoint",0);
 
-  ELog::EM<<"GItem == "<<GItem.getKey("Beam").getLinkPt(-1)
-	  <<ELog::endDiag;
   essBeamSystem::setBeamAxis(*beerAxis,Control,GItem,1);
-  
+
   BendA->addInsertCell(GItem.getCells("Void"));
   BendA->setFront(GItem.getKey("Beam"),-1);
   BendA->setBack(GItem.getKey("Beam"),-2);
   BendA->createAll(System,*beerAxis,-3);
+  // wheel cuts outer guide void !!!!!!!!!
+  if (isActive("wheel") && BendA->hasCell("Layer2"))
+    BendA->insertComponent(System,"Layer2",getComplementRule("wheel"));
+
+  // NOTE: Beer intersects the target void !!!!!
+  
   ELog::EM<<"BeerAxis == "<<beerAxis->getLinkAxis(-3)<<ELog::endDiag;
   if (stopPoint==1) return;                      // STOP At monolith
                                                  // edge

Model/ESSBeam/beer/BEERvariables.cxx

@@ -3,7 +3,7 @@
  
  * File:    ESSBeam/beer/BEERvariables.cxx
  *
- * Copyright (c) 2004-2017 by Stuart Ansell
+ * Copyright (c) 2004-2023 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,6 +43,7 @@
 #include "varList.h"
 #include "FuncDataBase.h"
 
+#include "CFFlanges.h"
 #include "FocusGenerator.h"
 #include "ShieldGenerator.h"
 #include "ChopperGenerator.h"
@@ -151,9 +152,8 @@ BEERvariables(FuncDataBase& Control)
   SGen.addRoofMat(5,"Concrete");
   SGen.addWallMat(5,"Concrete");
 
-  PipeGen.setPipe(12.0,0.8);
-  PipeGen.setWindow(-2.0,0.8);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setCF<CF250>();
+  PipeGen.setNoWindow();
 
   //  setVariable::ShieldGenerator SGen;
   // extent of beamline
@@ -200,6 +200,7 @@ BEERvariables(FuncDataBase& Control)
   BGen.addPhase({95,275},{30.0,30.0});
   BGen.generateBlades(Control,"beerWFMBlade",0.0,40.0,75.0);
 
+  PipeGen.setCF<CF300>();
   PipeGen.generatePipe(Control,"beerPipeD",125.0);
   Control.addVariable("beerPipeDYStep",4.0);
   FGen.generateBender(Control,"beerBD",121.0,4.0,4.0,20.0,16.0,

Model/ESSBeam/beerInc/BEER.h

@@ -3,7 +3,7 @@
  
  * File:   ESSBeam/beer/BEER.h
  *
- * Copyright (c) 2004-2022 by Stuart Ansell
+ * Copyright (c) 2004-2023 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,7 +75,10 @@ namespace essSystem
     \brief BEER beamline constructor for the ESS
   */
 
-class BEER : public attachSystem::CopiedComp
+class BEER :
+    public attachSystem::CopiedComp,
+    public attachSystem::ExternalCut
+    
 {
  private:
 

Model/ESSBeam/bifrost/BIFROSTvariables.cxx

@@ -3,7 +3,7 @@
  
  * File:    ESSBeam/bifrost/BIFROSTvariables.cxx
  *
- * Copyright (c) 2004-2022 by Stuart Ansell
+ * Copyright (c) 2004-2023 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,6 +42,8 @@
 #include "Code.h"
 #include "varList.h"
 #include "FuncDataBase.h"
+#include "CFFlanges.h"
+
 #include "FocusGenerator.h"
 #include "ShieldGenerator.h"
 #include "ChopperGenerator.h"
@@ -70,8 +72,8 @@ BIFROSTvariables(FuncDataBase& Control)
   setVariable::BladeGenerator BGen;
 
   PipeGen.setPipe(8.0,0.5);
-  PipeGen.setWindow(-2.0,0.5);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setNoWindow();
+  PipeGen.setFlange(12.0,1.0);
 
   SGen.addWall(1,20.0,"CastIron");
   SGen.addRoof(1,20.0,"CastIron");
@@ -124,9 +126,8 @@ BIFROSTvariables(FuncDataBase& Control)
   BGen.generateBlades(Control,"bifrostDBlade",0.0,20.0,35.0);
 
   // VACUUM PIPE: SDisk to T0 (A)
-  PipeGen.setPipe(12.0,0.5);
-  PipeGen.setWindow(-2.0,0.5);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setCF<CF250>();
+  PipeGen.setNoWindow();
   PipeGen.generatePipe(Control,"bifrostPipeC",400.0);
   Control.addVariable("bifrostPipeCYStep",2.0);
   Control.addVariable("bifrostPipeCNDivision",1);
@@ -145,19 +146,17 @@ BIFROSTvariables(FuncDataBase& Control)
   BGen.generateBlades(Control,"bifrostFOC1Blade",0.0,20.0,35.0);
 
   // VACUUM PIPE: from ChoperB to 6m holding point
-  PipeGen.setPipe(12.0,0.5);
-  PipeGen.setWindow(-2.0,0.5);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setCF<CF250>();
+  PipeGen.setNoWindow();
   PipeGen.generatePipe(Control,"bifrostPipeD",500.0);
   Control.addVariable("bifrostPipeDYStep",2.0);
 
   FGen.clearYOffset();
   FGen.generateRectangle(Control,"bifrostFD",496.0, 13.0,13.0);   
 
   // VACUUM PIPE: from ChoperB to 6m holding point
-  PipeGen.setPipe(12.0,0.5);
-  PipeGen.setWindow(-2.0,0.5);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setCF<CF250>();
+  PipeGen.setNoWindow();
   PipeGen.generatePipe(Control,"bifrostPipeE",400.0);
   Control.addVariable("bifrostPipeEYStep",2.0);
 
@@ -174,9 +173,8 @@ BIFROSTvariables(FuncDataBase& Control)
   BGen.generateBlades(Control,"bifrostFOC2Blade",0.0,20.0,35.0);
 
   // VACUUM PIPE: from ChoperC with 4m
-  PipeGen.setPipe(12.0,0.5);
-  PipeGen.setWindow(-2.0,0.5);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setCF<CF250>();
+  PipeGen.setNoWindow();
   PipeGen.generatePipe(Control,"bifrostPipeF",481.5);
   Control.addVariable("bifrostPipeFYStep",2.0);
 
@@ -222,8 +220,8 @@ BIFROSTvariables(FuncDataBase& Control)
 
   // VACUUM PIPE: in bunker wall
   PipeGen.setPipe(6.0,0.5);
-  PipeGen.setWindow(-2.0,0.5);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setNoWindow();
+  PipeGen.setFlange(10.0,1.0);
   PipeGen.generatePipe(Control,"bifrostPipeWall",348.0);
   Control.addVariable("bifrostPipeWallYStep",1.0);
   // Guide in wall
@@ -236,9 +234,8 @@ BIFROSTvariables(FuncDataBase& Control)
   SGen.generateShield(Control,"bifrostShieldA",6500.0,40.0,40.0,40.0,4,8);
   Control.addVariable("bifrostShieldAYStep",-4.0);
   // VACUUM PIPE: leaving bunker
-  PipeGen.setPipe(6.0,0.5);
-  PipeGen.setWindow(-2.0,0.5);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setCF<CF150>();
+  PipeGen.setNoWindow();
   PipeGen.generatePipe(Control,"bifrostPipeOutA",600);
   Control.addVariable("bifrostPipeOutAYStep",4.0);
 
@@ -247,9 +244,7 @@ BIFROSTvariables(FuncDataBase& Control)
   FGen.generateTaper(Control,"bifrostFOutA",596.0,5.232,5.84, 5.232,5.84);   
 
   // Second vacuum pipe out of bunker [before chopper pit]
-  PipeGen.setPipe(6.0,0.5);
-  PipeGen.setWindow(-2.0,0.5);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setCF<CF250>();
   PipeGen.generatePipe(Control,"bifrostPipeOutB",600);
   Control.addVariable("bifrostPipeOutBYStep",4.0);
 
@@ -259,9 +254,8 @@ BIFROSTvariables(FuncDataBase& Control)
   FGen.generateTaper(Control,"bifrostFOutB",596.0,5.84,7.04, 5.84,7.04);   
 
   // Second vacuum pipe out of bunker [before chopper pit]
-  PipeGen.setPipe(7.0,0.5);
-  PipeGen.setWindow(-2.0,0.5);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setCF<CF250>();
+  PipeGen.setNoWindow();
   PipeGen.generatePipe(Control,"bifrostPipeOutC",480.0);
   Control.addVariable("bifrostPipeOutCYStep",4.0);
 
@@ -357,8 +351,8 @@ BIFROSTvariables(FuncDataBase& Control)
 
   // Second vacuum pipe out of bunker [before chopper pit]
   PipeGen.setPipe(6.0,0.5);
-  PipeGen.setWindow(-2.0,0.5);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setNoWindow();
+  PipeGen.setFlange(10.0,1.0);
   PipeGen.generatePipe(Control,"bifrostPipeCave",250.0);
   Control.addVariable("bifrostPipeCaveYStep",2.0);
 

Model/ESSBeam/cspec/CSPECvariables.cxx

@@ -72,8 +72,9 @@ CSPECvariables(FuncDataBase& Control)
   setVariable::BladeGenerator BGen;
   setVariable::TwinGenerator TGen;
 
+  PipeGen.setCF<CF250>();
   PipeGen.setNoWindow();
-  PipeGen.setCF<CF200>();
+
 
   // extent of beamline
   Control.addVariable("cspecStopPoint",0);
@@ -90,9 +91,10 @@ CSPECvariables(FuncDataBase& Control)
   FGen.clearYOffset();
   FGen.generateRectangle(Control,"cspecFB",44.0, 10.6,14.8);   
 
+  
   PipeGen.generatePipe(Control,"cspecPipeC",1260.0);
   Control.addVariable("cspecPipeCYStep",4.0);
-  FGen.generateRectangle(Control,"cspecFC",1256.0, 10.6,14.8);   
+  FGen.generateRectangle(Control,"cspecFC",1256.0,10.6,14.8);   
 
   CGen.setMainRadius(38.122);   // diameter 70.0 internal
   CGen.setFrame(86.5,86.5);

Model/ESSBeam/dream/DREAMvariables.cxx

@@ -3,7 +3,7 @@
  
  * File:    ESSBeam/dream/DREAMvariables.cxx
  *
- * Copyright (c) 2004-2022 by Stuart Ansell
+ * Copyright (c) 2004-2023 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -237,7 +237,7 @@ DREAMvariables(FuncDataBase& Control)
   FGen.generateOctagon(Control,"dreamFOutC",1183.0,5.86,4.34); 
 
   PipeGen.setWindowMat("Void"); 
-  PipeGen.setWindow(-2.0,0.0);
+  PipeGen.setNoWindow();
   // Part of Guide Section 4 inside Cave
   PipeGen.generatePipe(Control,"dreamPipeCaveA",516.36);
   Control.addVariable("dreamPipeCaveAYStep",0.0);

Model/ESSBeam/freia/FREIA.cxx

@@ -3,7 +3,7 @@
  
  * File:   ESSBeam/freia/FREIA.cxx
  *
- * Copyright (c) 2004-2022 by Stuart Ansell
+ * Copyright (c) 2004-2023 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Model/ESSBeam/freia/FREIAvariables.cxx

@@ -3,7 +3,7 @@
  
  * File:    ESSBeam/freia/FREIAvariables.cxx
  *
- * Copyright (c) 2004-2017 by Stuart Ansell
+ * Copyright (c) 2004-2023 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,6 +42,8 @@
 #include "Code.h"
 #include "varList.h"
 #include "FuncDataBase.h"
+#include "CFFlanges.h"
+
 #include "FocusGenerator.h"
 #include "ShieldGenerator.h"
 #include "ChopperGenerator.h"
@@ -77,9 +79,8 @@ FREIAvariables(FuncDataBase& Control)
   SGen.addRoofMat(5,"Concrete");
   SGen.addWallMat(5,"Concrete");
 
-  PipeGen.setPipe(12.0,0.5);
-  PipeGen.setWindow(-2.0,0.3);
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setCF<CF250>();
+  PipeGen.setNoWindow();
 
   //  setVariable::ShieldGenerator SGen;
   // extent of beamline

Model/ESSBeam/loki/LOKIvariables.cxx

@@ -3,7 +3,7 @@
  
  * File:   ESSBeam/loki/LOKIvariables.cxx
  *
- * Copyright (c) 2004-2022 by Stuart Ansell
+ * Copyright (c) 2004-2023 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -130,8 +130,8 @@ LOKIvariables(FuncDataBase& Control)
 
   // Guide from First chopper to Wall
   PipeGen.setPipe(5.0,0.8);  // Rad / thick
-  PipeGen.setWindow(-2.0,0.8);  // window offset/ thick
-  PipeGen.setFlange(-4.0,1.0);
+  PipeGen.setNoWindow();
+  PipeGen.setFlange(9.0,1.0);
   PipeGen.generatePipe(Control,"lokiPipeC",487.0);
   Control.addVariable("lokiPipeCYStep",1.0);
   FGen.generateRectangle(Control,"lokiFC",484.0,2.5,3.0);

Model/ESSBeam/miracles/MIRACLES.cxx

@@ -3,7 +3,7 @@
  
  * File:   ESSBeam/miracles/MIRACLES.cxx
  *
- * Copyright (c) 2004-2022 by Stuart Ansell
+ * Copyright (c) 2004-2023 by Stuart Ansell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -79,6 +79,7 @@
 #include "DiskChopper.h"
 #include "GeneralPipe.h"
 #include "VacuumPipe.h"
+#include "RectanglePipe.h"
 #include "Bunker.h"
 #include "BunkerInsert.h"
 #include "SingleChopper.h"
@@ -110,23 +111,23 @@ MIRACLES::MIRACLES(const std::string& keyName) :
 
   VPipeD(new constructSystem::VacuumPipe(newName+"PipeD")),
   FocusD(new beamlineSystem::PlateUnit(newName+"FD")),
-
+  
   TwinC(new essConstruct::TwinChopper(newName+"TwinC")),
   CDiskTop(new essConstruct::DiskChopper(newName+"CBladeTop")),
   CDiskLow(new essConstruct::DiskChopper(newName+"CBladeLow")),
 
-  VPipeE(new constructSystem::VacuumPipe(newName+"PipeE")),
+  VPipeE(new constructSystem::RectanglePipe(newName+"PipeE")),
   FocusE(new beamlineSystem::PlateUnit(newName+"FE")),
 
   ChopE(new essConstruct::SingleChopper(newName+"ChopE")),
   EDisk(new essConstruct::DiskChopper(newName+"EBlade")),
 
   ShutterA(new constructSystem::BeamShutter(newName+"ShutterA")),
 
-  VPipeF(new constructSystem::VacuumPipe(newName+"PipeF")),
+  VPipeF(new constructSystem::RectanglePipe(newName+"PipeF")),
   FocusF(new beamlineSystem::PlateUnit(newName+"FF")),
 
-  VPipeG(new constructSystem::VacuumPipe(newName+"PipeG")),
+  VPipeG(new constructSystem::RectanglePipe(newName+"PipeG")),
   BendG(new beamlineSystem::BenderUnit(newName+"BG")),
 
   BInsert(new BunkerInsert(newName+"BInsert")),
@@ -264,7 +265,7 @@ MIRACLES::buildBunkerUnits(Simulation& System,
   CDiskTop->createAll(System,TwinC->getKey("MotorTop"),0,
                       TwinC->getKey("Beam"),-1);
   TwinC->insertAxle(System,*CDiskLow,*CDiskTop);
-  
+
   VPipeE->addAllInsertCell(bunkerVoid);
   VPipeE->createAll(System,TwinC->getKey("Beam"),2);