Updates to fix Vac

Author: SAnsell

CMake.pl

@@ -136,7 +136,7 @@
 
     elsif ($mainProg eq "fullBuild")
       {
-	my @fullBuild = qw( t2Build ralBuild );
+	my @fullBuild = qw( t2Build ralBuild ralVar);
 	push(@fullBuild,@mainLib);
 	$gM->addDepUnit("fullBuild", [@fullBuild]),
       }

Model/ralBuild/BlockShutter.cxx

@@ -115,7 +115,6 @@ BlockShutter::populate(const FuncDataBase& Control)
   colletFGap=Control.EvalVar<double>(blockKey+"ColletFGap");
   colletMat=ModelSupport::EvalMat<int>(Control,blockKey+"ColletMat");
 
-
   return;
 }
 

Model/ralBuild/GeneralShutter.cxx

@@ -295,7 +295,8 @@ GeneralShutter::applyRotations()
 
   attachSystem::FixedComp& mainFC=FixedGroup::getKey("Main");
   attachSystem::FixedComp& beamFC=FixedGroup::getKey("Beam");
-  
+
+  ELog::EM<<"P = "<<keyName<<"  == "<<ZOffset<<ELog::endDiag;  
   // Now do rotation:
 
   mainFC.setCentre(Y*voidXoffset);
@@ -315,6 +316,7 @@ GeneralShutter::applyRotations()
   //              [close == 3: close imp =-1]
 
   targetPt=Origin+XYAxis*outerRadius;
+
   frontPt=Origin+XYAxis*innerRadius+Z*openZShift;
   endPt=frontPt+XYAxis*(outerRadius-innerRadius);
 
@@ -366,18 +368,17 @@ GeneralShutter::createSurfaces()
   */
 {
   ELog::RegMethod RegA("GeneralShutter","createSurfaces");
+  ELog::EM<<"START = "<<keyName<<ELog::endDiag;
 
   // Divide:
   //  ModelSupport::buildPlane(SMap,buildIndex+10,Origin,Y);
-  
   // Fixed Steel  
   ModelSupport::buildPlane(SMap,buildIndex+5,
 			   Origin+Z*(totalHeight-upperSteel),Z);
 
   // Top blade [NOTE : BeamAxis]
   ModelSupport::buildPlane(SMap,buildIndex+15,
 			   frontPt+Z*shutterHeight,Z);
-
   // Inner cut [on flightline]
   ModelSupport::buildPlane(SMap,buildIndex+25,
    frontPt+Z*(voidZOffset+voidHeight/2.0+centZOffset),zSlope);
@@ -404,7 +405,6 @@ GeneralShutter::createSurfaces()
   // Outer cut [on flightline]
   ModelSupport::buildPlane(SMap,buildIndex+225,
 	      frontPt+Z*(voidZOffset+voidHeightOuter/2.0+centZOffset),zSlope);
-  
   // Outer cut [on flightline]
   ModelSupport::buildPlane(SMap,buildIndex+226,
 	   frontPt-Z*(-voidZOffset+voidHeightOuter/2.0-centZOffset),zSlope);

Model/ralBuildInc/GeneralShutter.h

@@ -108,7 +108,7 @@ class GeneralShutter :
   int lowerCell;                ///< Block that stops the beam
   int innerVoidCell;            ///< inner void cell
 
-  double ZOffset;
+  double ZOffset;               ///< Working ZOffset
   //--------------
   // FUNCTIONS:
   //--------------
@@ -123,7 +123,6 @@ class GeneralShutter :
   void createBlocks(Simulation&);
   void createLinks();
   void applyRotations();
-
 
  public:
 
@@ -164,7 +163,7 @@ class GeneralShutter :
   virtual int exitWindow(const double,std::vector<int>&,
 			 Geometry::Vec3D&) const;
 
-  void setZOffset(const double D) { ZOffset=D; }
+  void setZOffset(const double D) { ZOffset=D; ELog::EM<<"ERROR "<<keyName<<ELog::endErr;}
   void createAll(Simulation&,const attachSystem::FixedComp&,
 		 const long int sideIndex);
 

Model/t1Build/t1BulkShield.cxx

@@ -257,9 +257,9 @@ t1BulkShield::createShutters(Simulation& System)
       else if (i==merlinShutter)
 	GData.push_back(std::shared_ptr<GeneralShutter>
 			(new BlockShutter(i,"shutter","merlinShutter")));
-//      else if (i==s5Shutter)
-//	GData.push_back(std::shared_ptr<GeneralShutter>
-//			(new BlockShutter(i,"shutter","s5Shutter")));
+      else if (i==s5Shutter)
+	GData.push_back(std::shared_ptr<GeneralShutter>
+			(new BlockShutter(i,"shutter","s5Shutter")));
       else if (i==mariShutter)
 	GData.push_back(std::shared_ptr<GeneralShutter>
 			(new BlockShutter(i,"shutter","mariShutter")));

Model/t2Build/BulkShield.cxx

@@ -69,6 +69,7 @@
 #include "ContainedGroup.h"
 #include "ExternalCut.h"
 #include "GeneralShutter.h"
+#include "BlockShutter.h"
 #include "BulkInsert.h"
 #include "Torpedo.h"
 #include "BulkShield.h"
@@ -260,9 +261,14 @@ BulkShield::createShutters(Simulation& System)
 
   // This is ugly since it is also declared in makeZoom/makeChipIR
 
+  const std::vector<std::string> shutterName=
+    {
+      "chipIR", "T2", "T3", "T4", "T5",   "T6", "T7",  "T8", "T9",
+      "Wish",  "T11", "T12",  "T13","T14", "T15", "T16", "T17", "T18"};
   ModelSupport::objectRegister& OR=
     ModelSupport::objectRegister::Instance();
 
+  
   // const bool chipFlag(excludeSet.find("chipIR")==excludeSet.end());
   // const bool zoomFlag(excludeSet.find("zoom")==excludeSet.end());
   // const bool letFlag(excludeSet.find("LET")==excludeSet.end());
@@ -281,10 +287,10 @@ BulkShield::createShutters(Simulation& System)
       // 			(new BlockShutter(i+1,"shutter","letShutter")));
       //      else
       GData.push_back(std::shared_ptr<GeneralShutter>
-		      (new GeneralShutter(i+1,"shutter")));
+		      (new BlockShutter(i+1,"shutter",shutterName[i])));
       OR.addObject(GData.back());
     }
-
+  ELog::EM<<"HED == "<<ELog::endDiag;
   // const int shutterCell=getCell("Shutter");
   // MonteCarlo::Object* shutterObj=System.findObject(shutterCell);
   // if (!shutterObj)

Model/t2Build/ReflectorAssembly.cxx

@@ -232,7 +232,8 @@ ReflectorAssembly::createObjects(Simulation& System)
     (DMod->getKeyName(),"DMod to CC failed");
 
   DVacObj->addInsertCell(refCell);
-  DVacObj->buildSingle(System,*DMod,CMod->getExclude());
+  DVacObj->setCutSurf("Internal",CMod->getOuterSurf());
+  DVacObj->buildSingle(System,*DMod);
   RefObj->insertComponent(System,"FLNarrow",DVacObj->getMainRule("front"));
   RefObj->insertComponent(System,"FLWish",DVacObj->getMainRule("back"));
 

Model/t2Build/TS2variables.cxx

@@ -40,6 +40,7 @@
 #include "Code.h"
 #include "varList.h"
 #include "FuncDataBase.h"
+#include "BlockShutterGenerator.h"
 
 namespace setVariable
 {
@@ -770,6 +771,32 @@ TS2layout(FuncDataBase& Control)
   Control.addVariable("shutterBlock1Mat2","Aluminium");
   Control.addVariable("shutterBlock1Mat3","B-Poly");
 
+    // SHUTTERS COLLIMATION:
+
+  BlockShutterGenerator BSGen;
+ 
+  // x/z step : x/zAngle : beamSize : beam change angle (+ve is focused)
+  //  BSGen.generateCyl(Control,"sandals",-1.6,0.0,   -1.6,0.0,  7.3309,0.3595   );
+  BSGen.generateBox(Control,"chipIR",-1.6,0.0,   -1.6, 0.0,  6.17,8.61, 0.35,0.47);  // USE ABOVE
+  BSGen.generateBox(Control,"T2", -1.7,0.0,    0.0,0.0,   6.17,8.61, 0.35,0.47);
+  BSGen.generateBox(Control,"T3",    2.2,0.0,    2.0,-1.5,  6.74,4.8,  0.05,0.44); 
+  BSGen.generateBox(Control,"T4",   2.2,0.0,    2.2,-1.5,  7.91,4.57, 0.22,0.275); 
+  BSGen.generateBox(Control,"T5",     2.2,0.0,    0.0,0.0,   7.9, 7.9,  0.395,0.395); 
+  BSGen.generateBox(Control,"T6",    2.0,0.0,    0.0,0.0,   6.79,6.79, 0.0,0.0); 
+  BSGen.generateBox(Control,"nimrod",-1.7,0.0,    0.0,0.0,   8.22,7.93, 0.35,0.22); 
+  BSGen.generateBox(Control,"T8",  -1.5,0.0,    0.0,0.0,   8.4,8.0,   0.16,0.088); 
+  BSGen.generateBox(Control,"T9",    -1.3,0.0,   -0.6,0.0,   7.90,7.90, 0.63,0.63);    
+  BSGen.generateBox(Control,"zoom",    1.3,0.0,    0.0,0.0,   7.34,7.34, 0.22,0.22); 
+  BSGen.generateBox(Control,"sans2d", 1.7,0.0,    0.0,0.0,   7.38,7.38, 0.58,0.58);
+  BSGen.generateBox(Control,"T12",     2.0,0.0,    2.0,0.0,   8.88,8.88, 0.58,0.58); 
+  BSGen.generateBox(Control,"polref", -2.2,0.0,   -1.0,0.0,   9.4,9.4,   0.0,0.0);
+  BSGen.generateBox(Control,"offspec",      0.0,0.0,    0.0,0.0,   7.0,7.0,   0.0,0.0); // CLOSED
+  BSGen.generateBox(Control,"T15",    2.0,0.0,    0.7,0.0,   7.74,7.74, 0.48,0.48); 
+  BSGen.generateBox(Control,"T16",     1.4,0.0,    0.0,0.0,   7.4,8.6,   0.115,0.172);
+  BSGen.generateBox(Control,"T17",     1.4,0.0,    0.0,0.0,   7.4,8.6,   0.115,0.172);  
+  BSGen.generateBox(Control,"wish",    1.5,0.0,    1.5,0.0,   8.0,6.0,   0.143,0.0);
+
+
   // BULK INSERT
   Control.addVariable("bulkInsertIHeight",56.25);
   Control.addVariable("bulkInsertIWidth",32.50);

Model/t2Build/VacVessel.cxx

@@ -335,43 +335,45 @@ VacVessel::createSurfaces()
 }
 
 void
-VacVessel::createObjects(Simulation& System,const std::string& Exclude)
+VacVessel::createObjects(Simulation& System)
   /*!
     Adds the Chip guide components
     \param System :: Simulation to create objects in
     \param Exclude :: ContainedObject exclude string
   */
 {
   ELog::RegMethod RegA("VacVessel","createObjects");
+
+  HeadRule HR;
+
+  const HeadRule excludeHR=getRule("Internal");
 
-  std::string Out;
-  Out=ModelSupport::getComposite(SMap,buildIndex,"-41 -42 43 -44 45 -46");
-  addOuterSurf(Out);
+  HR=ModelSupport::getHeadRule(SMap,buildIndex,"-41 -42 43 -44 45 -46");
+  addOuterSurf(HR);
 
   // Inner 
-  Out=ModelSupport::getComposite(SMap,buildIndex,"-1 -2 3 -4 5 -6");
-  Out+=" "+Exclude;
-  System.addCell(MonteCarlo::Object(cellIndex++,0,0.0,Out));
+  HR=ModelSupport::getHeadRule(SMap,buildIndex,"-1 -2 3 -4 5 -6");
+  System.addCell(cellIndex++,0,0.0,HR*excludeHR);
 
   // First Al layer
-  Out=ModelSupport::getComposite(SMap,buildIndex,"-11 -12 13 -14 15 -16 "
+  HR=ModelSupport::getHeadRule(SMap,buildIndex,"-11 -12 13 -14 15 -16 "
 				 " (1:2:-3:4:-5:6) ");
-  System.addCell(MonteCarlo::Object(cellIndex++,alMat,0.0,Out));
+  System.addCell(cellIndex++,alMat,0.0,HR);
 
   // Tertiay layer
-  Out=ModelSupport::getComposite(SMap,buildIndex,"-21 -22 23 -24 25 -26 "
+  HR=ModelSupport::getHeadRule(SMap,buildIndex,"-21 -22 23 -24 25 -26 "
 				 " (11:12:-13:14:-15:16) ");
-  System.addCell(MonteCarlo::Object(cellIndex++,0,0.0,Out));
+  System.addCell(cellIndex++,0,0.0,HR);
 
   // Tertiay layer
-  Out=ModelSupport::getComposite(SMap,buildIndex,"-31 -32 33 -34 35 -36 "
+  HR=ModelSupport::getHeadRule(SMap,buildIndex,"-31 -32 33 -34 35 -36 "
 				 " (21:22:-23:24:-25:26) ");
-  System.addCell(MonteCarlo::Object(cellIndex++,outMat,0.0,Out));
+  System.addCell(cellIndex++,outMat,0.0,HR);
 
   // Outer clearance
-  Out=ModelSupport::getComposite(SMap,buildIndex,"-41 -42 43 -44 45 -46 "
+  HR=ModelSupport::getHeadRule(SMap,buildIndex,"-41 -42 43 -44 45 -46 "
 				 " (31:32:-33:34:-35:36) ");
-  System.addCell(MonteCarlo::Object(cellIndex++,0,0.0,Out));
+  System.addCell(cellIndex++,0,0.0,HR);
 
   return;
 }
@@ -502,7 +504,7 @@ VacVessel::buildPair(Simulation& System,const Groove& GMod,
   createUnitVector(GMod,0);
   createBoundary(GMod,HMod);
   createSurfaces();
-  createObjects(System,GMod.getExclude()+" "+HMod.getExclude());
+  createObjects(System); //GMod.getExclude()+" "+HMod.getExclude());
   createLinks();
   insertObjects(System);       
 
@@ -526,13 +528,12 @@ VacVessel::buildPair(Simulation& System,const Groove& GMod,
 
 void
 VacVessel::buildSingle(Simulation& System,
-		     const attachSystem::FixedComp& AFC,
-		     const std::string& exclude)
+		       const attachSystem::FixedComp& AFC)
 
   /*!
     Global creation of the vac-vessel
     \param System :: Simulation to add vessel to
-    \param FC :: Previously build  moderator
+    \param AFC :: Previously build  moderator
     \param CC :: Container to wrap
   */
 {
@@ -542,7 +543,7 @@ VacVessel::buildSingle(Simulation& System,
   createUnitVector(AFC,0);                       // fixed 
   createBoundary(AFC);
   createSurfaces();
-  createObjects(System,exclude);  // CC.getExclude()
+  createObjects(System); 
   createLinks();
   insertObjects(System);       
 

Model/t2Build/makeTS2.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   moderator/makeTS2.cxx
+ * File:   t2Build/makeTS2.cxx
  *
  * Copyright (c) 2004-2022 by Stuart Ansell
  *

Model/t2BuildInc/BulkShield.h

@@ -43,10 +43,11 @@ namespace shutterSystem
   \brief Specialized for for the BulkShield
 */
 
-class BulkShield : public attachSystem::FixedComp,
-  public attachSystem::ContainedComp,
-  public attachSystem::CellMap,
-  public attachSystem::ExternalCut
+class BulkShield :
+    public attachSystem::FixedComp,
+    public attachSystem::ContainedComp,
+    public attachSystem::CellMap,
+    public attachSystem::ExternalCut
 {
  private:
 

Model/t2BuildInc/VacVessel.h

@@ -95,7 +95,7 @@ class VacVessel :
 		      const attachSystem::FixedComp&);
   void createSurfaces();
   void createLinks();
-  void createObjects(Simulation&,const std::string&);
+  void createObjects(Simulation&);
 
   Geometry::Vec3D getDirection(const size_t) const;
 
@@ -111,8 +111,8 @@ class VacVessel :
   int getDivideSurf() const { return divideSurf; }
 
   void buildPair(Simulation&,const Groove&,const Hydrogen&);
-  void buildSingle(Simulation&, const attachSystem::FixedComp&,
-		 const std::string&);
+  void buildSingle(Simulation&, const attachSystem::FixedComp&);
+
 
 
 

add.pl

@@ -2,7 +2,7 @@
 use strict;
 my $text=
 '*
- * Copyright (c) 2004-2014 by Stuart Ansell
+ * Copyright (c) 2004-2022 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

beamline/PlateUnit.cxx

@@ -122,7 +122,10 @@ PlateUnit::~PlateUnit()
   /*!
     Destructor
    */
-{}
+{
+  delete frontCV;
+  delete backCV;
+}
 
 PlateUnit*
 PlateUnit::clone() const