Update for better calcSurfIntersection:

  This uses the surface logically +/- to determine the
  exit point. [This improved the old +/- delta where delta was
  a small number and ths inaccurate along a surface.]

Author: SAnsell

Model/d4cModel/DetectorBank.cxx

@@ -3,7 +3,7 @@
  
  * File:   d4cModel/DetectorBank.cxx
  *
- * Copyright (c) 2004-2019 by Stuart Ansell
+ * Copyright (c) 2004-2024 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
@@ -57,7 +57,7 @@
 #include "TallyCreate.h"
 #include "LinkUnit.h"
 #include "FixedComp.h"
-#include "FixedOffset.h"
+#include "FixedRotate.h"
 #include "ContainedComp.h"
 #include "DetectorBank.h"
 
@@ -69,8 +69,8 @@ namespace d4cSystem
 {
 
 DetectorBank::DetectorBank(const size_t BN,const std::string& Key) :
+  attachSystem::FixedRotate(Key+std::to_string(BN),6),
   attachSystem::ContainedComp(),
-  attachSystem::FixedOffset(Key+std::to_string(BN),6),
   bankNumber(BN),baseName(Key)
   /*!
     Constructor
@@ -79,8 +79,9 @@ DetectorBank::DetectorBank(const size_t BN,const std::string& Key) :
   */
 {}
 
-DetectorBank::DetectorBank(const DetectorBank& A) : 
-  attachSystem::ContainedComp(A),attachSystem::FixedOffset(A),
+DetectorBank::DetectorBank(const DetectorBank& A) :
+  attachSystem::FixedRotate(A),
+  attachSystem::ContainedComp(A),
   bankNumber(A.bankNumber),baseName(A.baseName),
   centreOffset(A.centreOffset),
   centreAngle(A.centreAngle),detDepth(A.detDepth),
@@ -103,8 +104,8 @@ DetectorBank::operator=(const DetectorBank& A)
 {
   if (this!=&A)
     {
+      attachSystem::FixedRotate::operator=(A);
       attachSystem::ContainedComp::operator=(A);
-      attachSystem::FixedOffset::operator=(A);
       centreOffset=A.centreOffset;
       centreAngle=A.centreAngle;
       detDepth=A.detDepth;
@@ -133,11 +134,11 @@ DetectorBank::populate(const FuncDataBase& Control)
 {
   ELog::RegMethod RegA("DetectorBank","populate");
 
-  FixedOffset::populate(Control);
+  FixedRotate::populate(Control);
 
   centreOffset=Control.EvalTail<double>(keyName,baseName,"CentreOffset");
   centreAngle=Control.EvalTail<double>(keyName,baseName,"CentreAngle");
-  xyAngle-=centreAngle;
+  zAngle-=centreAngle;
   centreAngle*=M_PI/180.0;
 
   detHeight=Control.EvalTail<double>(keyName,baseName,"DetHeight");
@@ -152,8 +153,7 @@ DetectorBank::populate(const FuncDataBase& Control)
 				    baseName+"DetMat");
 
   // trick to get def var of a pair.
-  nDet=Control.EvalDefVar<size_t>(baseName+"NDet",0);
-  nDet=Control.EvalDefVar<size_t>(keyName+"NDet",nDet);
+  nDet=Control.EvalDefTail<size_t>(keyName,baseName,"NDet",0);
   return;
 }
 
@@ -170,7 +170,7 @@ DetectorBank::createUnitVector(const attachSystem::FixedComp& FC,
 
   Origin += (X*sin(centreAngle)+Y*cos(centreAngle))*centreOffset;
   applyShift(xStep,yStep,zStep);
-  applyAngleRotate(xyAngle,zAngle);
+  applyAngleRotate(xAngle,yAngle,zAngle);
 
   return;
 }
@@ -222,17 +222,17 @@ DetectorBank::createObjects(Simulation& System)
 {
   ELog::RegMethod RegA("DetectorBank","createObjects");
 
-  std::string Out;
+  HeadRule HR;
   // First make inner/outer void/wall and top/base
 
-  Out=ModelSupport::getComposite(SMap,buildIndex,"11 -12 13 -14 15 -16");	
-  addOuterSurf(Out);  
+  HR=ModelSupport::getHeadRule(SMap,buildIndex,"11 -12 13 -14 15 -16");	
+  addOuterSurf(HR);  
 
-  Out=ModelSupport::getComposite(SMap,buildIndex," 1 -2 3 -4 5 -6 ");
-  System.addCell(MonteCarlo::Object(cellIndex++,detMat,0.0,Out));	
-  Out=ModelSupport::getComposite(SMap,buildIndex,
-				 " 11 -12 13 -14 15 -16 (-1:2:-3:4:-5:6)");	
-  System.addCell(MonteCarlo::Object(cellIndex++,wallMat,0.0,Out));
+  HR=ModelSupport::getHeadRule(SMap,buildIndex,"1 -2 3 -4 5 -6");
+  System.addCell(cellIndex++,detMat,0.0,HR);	
+  HR=ModelSupport::getHeadRule(SMap,buildIndex,
+				"11 -12 13 -14 15 -16 (-1:2:-3:4:-5:6)");	
+  System.addCell(cellIndex++,wallMat,0.0,HR);
   return; 
 }
 

Model/d4cModel/d4cVariables.cxx

@@ -1,9 +1,9 @@
 /********************************************************************* 
-  CombLayer : MNCPX Input builder
+  CombLayer : MCNP(X) Input builder
  
  * File:   d4cModel/d4cVariables.cxx
  *
- * Copyright (c) 2004-2014 by Stuart Ansell
+ * Copyright (c) 2004-2024 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
@@ -115,7 +115,6 @@ D4CModel(FuncDataBase& Control)
   Control.addVariable("detectorYStep",0.0);         // Radius the beam
   Control.addVariable("detectorZStep",0.0);         // Radius the beam
   Control.addVariable("detectorZAngle",0.0);         // Radius the beam
-  Control.addVariable("detectorXYAngle",0.0);         // Radius the beam
   Control.addVariable("detectorNDetector",100);       //
   Control.addVariable("detectorInitAngle",2.0);       //
   Control.addVariable("detectorFinalAngle",165.0);       //
@@ -133,7 +132,6 @@ D4CModel(FuncDataBase& Control)
   Control.addVariable("DetBankYStep",0.0);         // Radius the beam
   Control.addVariable("DetBankZStep",0.0);         // Radius the beam
   Control.addVariable("DetBankZAngle",0.0);         // Radius the beam
-  Control.addVariable("DetBankXYAngle",0.0);         // Radius the beam
   Control.addVariable("DetBankNDet",8);       //
   Control.addVariable("DetBankCentreOffset",114.6);       //
   Control.addVariable("DetBankDetHeight",10.0);       //

Model/d4cModel/makeD4C.cxx

@@ -3,7 +3,7 @@
  
  * File:   d4cModel/makeD4C.cxx
  *
- * Copyright (c) 2004-2018 by Stuart Ansell
+ * Copyright (c) 2004-2024 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
@@ -52,8 +52,10 @@
 #include "Simulation.h"
 #include "LinkUnit.h"
 #include "FixedComp.h"
-#include "FixedOffset.h"
+#include "FixedRotate.h"
 #include "ContainedComp.h"
+#include "BaseMap.h"
+#include "CellMap.h"
 #include "World.h"
 #include "CylSample.h"
 #include "BellJar.h"
@@ -121,13 +123,13 @@ makeD4C::build(Simulation* SimPtr,
 
   BellObj->setInsertCell(74123);
   BellObj->createAll(*SimPtr,World::masterOrigin(),0);
-  CellObj->setInsertCell(BellObj->innerCell());
+  CellObj->setInsertCell(BellObj->getCell("innerVoid"));
   CellObj->createAll(*SimPtr,*BellObj,0);
 
   SimMonte* SM=dynamic_cast<SimMonte*>(SimPtr);
   for(size_t i=0;i<NDet;i++)
     {
-      DetObj[i]->setInsertCell(BellObj->outerCell());
+      DetObj[i]->setInsertCell(BellObj->getCell("outerVoid"));
       DetObj[i]->createAll(*SimPtr,*BellObj,0);
       DetObj[i]->createTally(*SimPtr);
 

Model/d4cModelInc/DetectorBank.h

@@ -3,7 +3,7 @@
  
  * File:   d4cModelInc/DetectorBank.h
  *
- * Copyright (c) 2004-2018 by Stuart Ansell
+ * Copyright (c) 2004-2024 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
@@ -40,8 +40,9 @@ namespace d4cSystem
   \brief Grid of detector objects 
 */
 
-class DetectorBank : public attachSystem::ContainedComp,
-    public attachSystem::FixedOffset
+class DetectorBank : 
+    public attachSystem::FixedRotate,
+    public attachSystem::ContainedComp
 {
  private:
 

Model/essBuild/BilbaoWheelInnerStructure.cxx

@@ -3,7 +3,7 @@
  
   * File:   essBuild/BilbaoWheelInnerStructure.cxx
   *
-  * Copyright (c) 2004-2023 by Stuart Ansell/Konstain Batkov
+  * Copyright (c) 2004-2024 by Stuart Ansell/Konstain Batkov
   *
   * 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
@@ -410,9 +410,10 @@ BilbaoWheelInnerStructure::createBrickSurfaces
 }
 
 double
-BilbaoWheelInnerStructure::sideIntersect(HeadRule&& HR,
-					 const Geometry::Plane *plSide)
- /*!
+BilbaoWheelInnerStructure::sideIntersect
+(HeadRule HR,
+ const Geometry::Plane *plSide)
+/*!
    Calculates intersect of a brick (void between bricks) 
    and one of the sector side surfaces.
    \param surf :: usrface string to calcuatex
@@ -422,7 +423,6 @@ BilbaoWheelInnerStructure::sideIntersect(HeadRule&& HR,
   ELog::RegMethod RegA("BilbaoWhieelInnerStructure","sideIntersect");
 
   std::vector<Geometry::Vec3D> Pts;
-  std::vector<int> SNum;
   const Geometry::Plane *pz = SMap.realPtr<Geometry::Plane>(buildIndex+5);
 
   HR.populateSurf();
@@ -433,7 +433,7 @@ BilbaoWheelInnerStructure::sideIntersect(HeadRule&& HR,
   if (!plSide->onSurface(Org))
     ELog::EM << "Origin of line is not on the surface" << ELog::endErr;
 
-  const size_t n = HR.calcSurfIntersection(Org, Unit, Pts, SNum);
+  const size_t n = HR.calcSurfIntersection(Org, Unit, Pts);
   double dist = -1.0;
   if (n>1)
     dist = Pts[0].Distance(Pts[1])+0.01; // 0.01 is a "safety" summand to get rid of the bricks where we cross in the corner. For some reason, 1st layer is not built without this number.

Model/essBuildInc/BilbaoWheelInnerStructure.h

@@ -3,7 +3,7 @@
  
  * File:   essBuildInc/BilbaoWheelInnerStructure.h
  *
- * Copyright (c) 2004-2023 by Stuart Ansell
+ * Copyright (c) 2004-2024 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,7 +79,7 @@ class BilbaoWheelInnerStructure :
   double getSectorAngle(const size_t index) const
   { return 180.0*static_cast<double>(2*(index+1)-1)/static_cast<double>(nSectors); }
 
-  double sideIntersect(HeadRule&&,const Geometry::Plane*);
+  double sideIntersect(HeadRule,const Geometry::Plane*);
 
   void createAll(Simulation&,const attachSystem::FixedComp&,const long int) override {}