Fix of singleItems to work.

  This is a fix of all the single item: They now ALL work.
  This can be checked with the script: CheckSingle.sh in the
  new directory PostCompile.

Author: SAnsell

Model/MaxIV/Linac/SPFCameraShield.cxx

@@ -3,7 +3,7 @@
 
  * File:   Model/MaxIV/Linac/SPFCameraShield.cxx
  *
- * Copyright (c) 2004-2021 by Konstantin Batkov
+ * Copyright (c) 2004-2022 by Konstantin 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
@@ -67,7 +67,8 @@ namespace tdcSystem
 SPFCameraShield::SPFCameraShield(const std::string& Key)  :
   attachSystem::ContainedComp(),
   attachSystem::FixedRotate(Key,6),
-  attachSystem::CellMap()
+  attachSystem::CellMap(),
+  attachSystem::SurfMap()
  /*!
     Constructor BUT ALL variable are left unpopulated.
     \param Key :: Name for item in search
@@ -78,6 +79,7 @@ SPFCameraShield::SPFCameraShield(const SPFCameraShield& A) :
   attachSystem::ContainedComp(A),
   attachSystem::FixedRotate(A),
   attachSystem::CellMap(A),
+  attachSystem::SurfMap(A),
   length(A.length),width(A.width),height(A.height),
   wallThick(A.wallThick),
   roofLength(A.roofLength),
@@ -104,6 +106,7 @@ SPFCameraShield::operator=(const SPFCameraShield& A)
       attachSystem::ContainedComp::operator=(A);
       attachSystem::FixedRotate::operator=(A);
       attachSystem::CellMap::operator=(A);
+      attachSystem::SurfMap::operator=(A);
       length=A.length;
       width=A.width;
       height=A.height;

Model/MaxIV/LinacInc/SPFCameraShield.h

@@ -3,7 +3,7 @@
 
  * File:   Model/MaxIV/LinacInc/SPFCameraShield.h
  *
- * Copyright (c) 2004-2021 by Konstantin Batkov
+ * Copyright (c) 2004-2022 by Konstantin 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
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  ****************************************************************************/
 #ifndef tdcSystem_SPFCameraShield_h
@@ -35,10 +35,11 @@ namespace tdcSystem
   \brief SPF Chamera shield
 */
 
-class SPFCameraShield : public attachSystem::ContainedComp,
-			public attachSystem::FixedRotate,
-			public attachSystem::CellMap,
-			public attachSystem::SurfMap
+class SPFCameraShield :
+    public attachSystem::ContainedComp,
+    public attachSystem::FixedRotate,
+    public attachSystem::CellMap,
+    public attachSystem::SurfMap
 {
  private:
 

Model/MaxIV/commonBeam/SquareFMask.cxx

@@ -189,15 +189,15 @@ SquareFMask::createSurfaces()
   ModelSupport::buildCylinder(SMap,buildIndex+8,Origin,Y,flangeBInRadius);
   ModelSupport::buildCylinder(SMap,buildIndex+18,Origin,Y,flangeBOutRadius);
 
-  // Inner Structure
-  //ModelSupport::buildPlane(SMap,buildIndex+101,MPt,Y);
 
   const double AH2(innerAHeight/2.0);
   const double MH2(innerMinHeight/2.0);
   const double BH2(innerBHeight/2.0);
   const double AW2(innerAWidth/2.0);
   const double MW2(innerMinWidth/2.0);
   const double BW2(innerBWidth/2.0);
+  // Inner Structure (no pipe)
+  ModelSupport::buildPlane(SMap,buildIndex+101,MPt,Y);
 
   ModelSupport::buildPlane(SMap,buildIndex+103,
 			   APt-X*AW2-Z*AH2,

Model/MaxIV/commonGenerator/YagScreenGenerator.cxx

@@ -3,7 +3,7 @@
 
  * File:   commonGenerator/YagScreenGenerator.cxx
  *
- * Copyright (c) 2004-2021 by Konstantin Batkov
+ * Copyright (c) 2004-2022 by Konstantin 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
@@ -66,9 +66,9 @@ YagScreenGenerator::YagScreenGenerator() :
   screenHolderRadius(1.3), screenHolderThick(0.3), // measured,
 
   holderMat("Stainless304L"),
-  mirrorMat("SiO2"),
   screenMat("SiO2"),
-  screenHolderMat("Aluminium")
+  screenHolderMat("Aluminium"),
+  mirrorMat("SiO2")
   /*!
     Constructor and defaults
   */

Model/MaxIV/commonGeneratorInc/YagScreenGenerator.h

@@ -3,7 +3,7 @@
 
  * File:   Model/MaxIV/LinacInc/YagScreenGenerator.h
  *
- * Copyright (c) 2004-2021 by Konstantin Batkov
+ * Copyright (c) 2004-2022 by Konstantin 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
@@ -57,7 +57,7 @@ class YagScreenGenerator :
   double screenThick;           ///< Thickness of screen
 
   double screenHolderRadius;     ///< screen holder thickness
-  double screenHolderThick;     ///< screen holder thickness
+  double screenHolderThick;      ///< screen holder thickness
 
 
   std::string holderMat;             ///< mirror holder material

Model/essBuild/BilbaoWheel.cxx

@@ -3,7 +3,7 @@
 
  * File:   essBuild/BilbaoWheel.cxx
  *
- * Copyright (c) 2004-2019 by Konstantin Batkov
+ * Copyright (c) 2004-2022 by Konstantin 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
@@ -1397,7 +1397,8 @@ BilbaoWheel::buildSectors(Simulation& System) const
 	c(new BilbaoWheelCassette(keyName,"Sec",i));
       OR.addObject(c);
       c->createAll(System,*this,0,
-		   7,8,9,12,i*360.0/static_cast<double>(nSectors));
+		   7,8,9,12,
+		   static_cast<double>(i)*360.0/static_cast<double>(nSectors));
     }
 }
 

Model/essBuild/Box.cxx

@@ -3,7 +3,7 @@
 
  * File:   essBuild/Box.cxx
  *
- * Copyright (c) 2004-2021 by Konstantin Batkov
+ * Copyright (c) 2004-2022 by Konstantin 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
@@ -308,9 +308,20 @@ Box::getLayerSurf(const size_t layerIndex,
     \return Surface string
   */
 {
-  ELog::RegMethod RegA("Box","getLinkSurf");
+  ELog::RegMethod RegA("Box","getLayerSurf");
 
-  throw ColErr::AbsObjMethod("Not implemented yet - do it similar to DiskPreMod?");
+  if (layerIndex>nLayers)
+    throw ColErr::IndexError<size_t>(layerIndex,nLayers,"layerIndex");
+
+  const int uSIndex(std::abs(static_cast<int>(sideIndex)));
+  const int signValue((sideIndex>0) ? 1 : -1);  
+  const int SI(10*static_cast<int>(layerIndex)+buildIndex);
+  
+
+  if (uSIndex<1 || uSIndex>6)
+    throw ColErr::IndexError<long int>(sideIndex,6,"sideIndex");
+  
+  return signValue*SMap.realSurf(SI+uSIndex);
 }
 
 
@@ -320,7 +331,7 @@ Box::getLayerString(const size_t layerIndex,
   /*!
     Given a side and a layer calculate the layer string
     \param layerIndex :: layer, 0 is inner moderator [0-4]
-    \param sideIndex :: Side [0-3]
+    \param sideIndex :: Side [1-6]
     \return Surface string
   */
 {
@@ -331,44 +342,40 @@ Box::getLayerString(const size_t layerIndex,
 
   const int SI(10*static_cast<int>(layerIndex)+buildIndex);
 
-  std::string Out;
+  HeadRule HR;
   const long int uSIndex(std::abs(sideIndex));
   switch(uSIndex)
     {
     case 1:
-      Out=ModelSupport::getComposite(SMap,SI," -1 ");
+      HR=ModelSupport::getHeadRule(SMap,SI,"-1");
       break;
     case 2:
-      Out=ModelSupport::getComposite(SMap,SI," 2 ");
+      HR=ModelSupport::getHeadRule(SMap,SI,"2");
       break;
     case 3:
-      Out=ModelSupport::getComposite(SMap,SI," -3 ");
+      HR=ModelSupport::getHeadRule(SMap,SI,"-3");
       break;
     case 4:
-      Out=ModelSupport::getComposite(SMap,SI," 4 ");
+      HR=ModelSupport::getHeadRule(SMap,SI,"4");
       break;
     case 5:
-      Out=ModelSupport::getComposite(SMap,SI," -5 ");
+      HR=ModelSupport::getHeadRule(SMap,SI,"-5");
       break;
     case 6:
-      Out=ModelSupport::getComposite(SMap,SI," 6 ");
+      HR=ModelSupport::getHeadRule(SMap,SI,"6");
       break;
     default:
       throw ColErr::IndexError<long int>(sideIndex,6,"sideIndex");
     }
   if (sideIndex<0)
-    {
-      HeadRule HR(Out);
-      HR.makeComplement();
-      return HR.display();
-    }
+    HR.makeComplement();
 
-  return Out;
+  return HR.display();
 }
 
 Geometry::Vec3D
 Box::getSurfacePoint(const size_t layerIndex,
-                            const long int sideIndex) const
+		     const long int sideIndex) const
   /*!
     Given a side and a layer calculate the surface point
     \param layerIndex :: layer, 0 is inner moderator

Model/essBuild/DiskLayerMod.cxx

@@ -3,7 +3,7 @@
  
  * File:   essBuild/DiskLayerMod.cxx
  *
- * Copyright (c) 2004-2019 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
@@ -354,10 +354,10 @@ DiskLayerMod::getLayerSurf(const size_t layerIndex,
     \return Surface string
   */
 {
-  ELog::RegMethod RegA("H2Moderator","getLinkSurf");
+  ELog::RegMethod RegA("H2Moderator","getLayerSurf");
 
   const size_t SI(static_cast<size_t>(std::abs(sideIndex)));
-  const int signValue((SI>0) ? 1 : -1);
+  const int signValue((sideIndex>0) ? 1 : -1);
 
   // Z direction is nLayer
   if (SI==5 || SI==6)

Model/essBuildInc/Box.h

@@ -35,10 +35,11 @@ namespace essSystem
   \brief Box with layers
 */
 
-class Box : public attachSystem::ContainedComp,
-  public attachSystem::FixedOffset,
-  public attachSystem::LayerComp,
-  public attachSystem::CellMap
+class Box :
+    public attachSystem::ContainedComp,
+    public attachSystem::FixedOffset,
+    public attachSystem::LayerComp,
+    public attachSystem::CellMap
 {
  private:
 

Model/singleItemBuild/makeSingleItem.cxx

@@ -504,10 +504,17 @@ makeSingleItem::build(Simulation& System,
       fm->addInsertCell(voidCell);
       fm->createAll(System,World::masterOrigin(),0);
 
+      // with pipes:
+      std::shared_ptr<xraySystem::SquareFMask>
+	fmb(new xraySystem::SquareFMask("FMaskB"));
+      OR.addObject(fmb);
+
+      fmb->addInsertCell(voidCell);
+      fmb->createAll(System,World::masterOrigin(),0);
+
       return;
     }
 
-
   if (item == "Jaws")
     {
       // diagnostic box

Model/singleItemBuild/singleItemVariables.cxx

@@ -253,13 +253,17 @@ SingleItemVariables(FuncDataBase& Control)
 
   // collimator block
   setVariable::SqrFMaskGenerator FMaskGen;
+
+  // B is standard
+  FMaskGen.generateColl(Control,"FMask",0.0,15.0);
+
   FMaskGen.setPipeRadius(-10.0);
   // FMaskGen.setCF<CF63>();
   // FMaskGen.setBFlangeCF<CF40>();
   // FMaskGen.setFrontGap(3.99,1.97);  //1033.8
   // FMaskGen.setBackGap(0.71,0.71);
   // FMaskGen.setMinSize(10.2,0.71,0.71);
-  FMaskGen.generateColl(Control,"FMask",0.0,15.0);
+  FMaskGen.generateColl(Control,"FMaskB",40.0,15.0);
 
 
   setVariable::EPSeparatorGenerator EPSGen;