Update to put files in better places

Author: SAnsell

Model/essBuild/LOKI.cxx Model/ESSBeam/loki/LOKI.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essBuild/LOKI.cxx
+ * File:   ESSBeam/loki/LOKI.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuild/LOKIvariables.cxx Model/ESSBeam/loki/LOKIvariables.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essBuild/LOKIvariables.cxx
+ * File:   ESSBeam/loki/LOKIvariables.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuild/LokiHut.cxx Model/ESSBeam/loki/LokiHut.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essBuild/VacTank.cxx
+ * File:   ESSBeam/loki/VacTank.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuild/VacTank.cxx Model/ESSBeam/loki/VacTank.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essBuild/NMX.cxx
+ * File:   ESSBeam/nmx/NMX.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuildInc/Hut.h Model/ESSBeam/lokiInc/Hut.h

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essBuild/NMXvariables.cxx
+ * File:   ESSBeam/nmx/NMXvariables.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuildInc/LOKI.h Model/ESSBeam/lokiInc/LOKI.h

@@ -42,9 +42,6 @@ namespace constructSystem
 namespace essSystem
 {  
   class GuideItem;
-  class LokiHut;
-  class VacTank;
-
   /*!
     \class NMX
     \version 1.0

Model/essBuildInc/LokiHut.h Model/ESSBeam/lokiInc/LokiHut.h

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essModel/Hut.cxx
+ * File:   ESSBeam/odin/Hut.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuildInc/VacTank.h Model/ESSBeam/lokiInc/VacTank.h

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essBuild/ODIN.cxx
+ * File:   ESSBeam/odin/ODIN.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuild/NMX.cxx Model/ESSBeam/nmx/NMX.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essModel/PinHole.cxx
+ * File:   ESSBeam/odin/PinHole.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *
@@ -268,4 +268,4 @@ PinHole::createAll(Simulation& System,
   return;
 }
 
-}  // NAMESPACE constructSystem
+}  // NAMESPACE essSystem

Model/essBuild/NMXvariables.cxx Model/ESSBeam/nmx/NMXvariables.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essModel/RentrantBS.cxx
+ * File:   ESSBeam/odin/RentrantBS.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *
@@ -285,4 +285,4 @@ RentrantBS::createAll(Simulation& System,
   return;
 }
 
-}  // NAMESPACE constructSystem
+}  // NAMESPACE essSystem

Model/essBuildInc/NMX.h Model/ESSBeam/nmxInc/NMX.h

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essBuildInc/ODIN.h
+ * File:   ESSBeam/odin/ODIN.h
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuild/Hut.cxx Model/ESSBeam/odin/Hut.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   constructInc/PinHole.h
+ * File:   ESSBeam/odin/PinHole.h
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuild/ODIN.cxx Model/ESSBeam/odin/ODIN.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   constructInc/RentrantBS.h
+ * File:   ESSBeam/odin/RentrantBS.h
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuild/ODINvariables.cxx Model/ESSBeam/odin/ODINvariables.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essBuild/DetectorTank.cxx
+ * File:   ESSBeam/vor/DetectorTank.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *
@@ -270,4 +270,4 @@ DetectorTank::createAll(Simulation& System,
 }
 
 
-}  // NAMESPACE zoomSystem
+}  // NAMESPACE essSystem

Model/essBuild/PinHole.cxx Model/ESSBeam/odin/PinHole.cxx

@@ -1,7 +1,7 @@
 /********************************************************************* 
   CombLayer : MCNP(X) Input builder
  
- * File:   essBuild/VORvariables.cxx
+ * File:    ESSBeam/vor/VORvariables.cxx
  *
  * Copyright (c) 2004-2015 by Stuart Ansell
  *

Model/essBuild/RentrantBS.cxx Model/ESSBeam/odin/RentrantBS.cxx

@@ -1,9 +1,9 @@
 /********************************************************************* 
-  CombLayer : MNCPX Input builder
+  CombLayer : MCNP(X) Input builder
  
  * File:   delft/ReactorGrid.cxx
  *
- * Copyright (c) 2004-2014 by Stuart Ansell
+ * Copyright (c) 2004-2015 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
@@ -243,7 +243,7 @@ ReactorGrid::getElementNumber(const std::string& Name)
   if (Name.size()!=2 && Name.size()!=3)
     throw ColErr::InvalidLine(Name,"Name wrong size",Name.size());
   std::pair<size_t,size_t> Out;
-  Out.first=toupper(Name[0])-static_cast<size_t>('A');
+  Out.first=static_cast<size_t>(std::toupper(Name[0])-std::toupper('A'));
   if (!StrFunc::convert(Name.substr(1),Out.second))
     throw ColErr::InvalidLine(Name,"Name number not understood");
   return Out;

Model/essBuildInc/ODIN.h Model/ESSBeam/odinInc/ODIN.h

@@ -302,7 +302,7 @@ BeamMonitor::createAll(Simulation& System,
 		       const attachSystem::ContainedGroup& CG,
 		       const std::string& CGName)
   /*!
-    Global creation of the hutch
+    Global creation of the monitor
     \param System :: Simulation to add vessel to
     \param FC :: Proton beam FixedComp for origin
     \param linkIndex :: link point on FC
@@ -323,4 +323,4 @@ BeamMonitor::createAll(Simulation& System,
   return;
 }
 
-}  // NAMESPACE instrumentSystem
+}  // NAMESPACE essSystem

Model/essBuildInc/PinHole.h Model/ESSBeam/odinInc/PinHole.h

@@ -52,7 +52,7 @@ sub new
     root=>0,
     rootcint=>0,
     gtk=>0,
-    gcov=>0,          ## Gcov
+    gcov=>0,         ## Gcov
     gsl=>0,          ## Gnu scietific lib
     regex=>0,        ## regex
     lua=>0,          ## lua
@@ -653,19 +653,24 @@ sub addSubDirLibs
   my $dirAll=`ls -d ./$topDirName/*/ 2> /dev/null`;
   my @DPts=split /\s+/,$dirAll;
   my @subDir;
-  my @blanklibFlags=("","");
+  my @blanklibFlags=("");
   foreach my $dname (@DPts)
     {
       if ($dname=~/$topDirName\/(.*)\//)
         {
-	  push(@subDir,$1);
-	  push(@blanklibFlags,"");
-	  print STDERR "Found subdir :",$1,"\n";
+	  my $subName=$1;
+	  my $filenames=`ls -d ./$topDirName/$subName/*.cxx 2> /dev/null`;
+	  my @FPts=split /\s+/,$filenames;
+	  if (@FPts)
+	    {
+	      push(@subDir,$subName);
+	      push(@blanklibFlags,"");
+	      print STDERR "Found subdir :",$subName,"\n";
+	    }
 	}
     }
 
-  $self->addDirLibs($topDirName,\@subDir,\@subDir,\@blanklibFlags) 
-      if (@subDir);
+  $self->addDirLibs($topDirName,\@subDir,\@subDir,\@blanklibFlags) if (@subDir);
   return;
 }
 
@@ -695,6 +700,34 @@ sub addSubIncDir
   return;
 }
 
+sub addCombinedDirLib
+  ##
+  ## Add an array of libraries
+  ## and their subdirectories
+  ##
+{
+  my $self=shift;
+  
+  my $dirName=shift; ## Directory tree name
+  my $LName=shift;  ## Library name
+  
+  my $Dr=shift;  ## Directorie
+  my $flags=shift;  ## Libflag
+
+  my @fullLibs;
+  my @fullNames;
+
+  
+  my $index=scalar($self->{LibName});
+  $self->{LibName}{$LName}=$index;
+
+  push(@{$self->{libnames}},$LName);
+  push(@{$self->{sublibdir}},$dirName."/".$Dr);
+  push(@{$self->{libflags}},$flags);
+  push(@{$self->{masterDirList}},$dirName);
+  return;
+}
+
 sub addDirLibs
   ##
   ## Add an array of libraries

Model/essBuildInc/RentrantBS.h Model/ESSBeam/odinInc/RentrantBS.h

@@ -103,24 +103,14 @@
 $gM->addCoreItems(\@core,\@coreInc);
 $gM->addLibs(\@libnames,\@sublibdir,\@libflags);
 
-my @vorInclude = qw( VORInc );
-$gM->addSubDirLibs("Model/essBuild");
-
+$gM->addSubDirLibs("Model/ESSBeam");
 $gM->addDirLibs("Model",\@modelNames,\@modelLibDir,\@libflags);
 $gM->addDirLibs("System",\@systemNames,\@systemLibDir,\@libflags);
 
 $gM->addIncDir(\@incdir);
 $gM->addIncSubDir("System",\@systemInclude);
 $gM->addIncSubDir("Model",\@modelInclude);
-$gM->addSubIncDir("Model/essBuildInc");
-# $gM->addIncSubDir("Model/essBuildInc",\@vorInclude);
-
-# my @libnames=("mcnpx","build","funcBase","geometry",  0,1,2,3
-#	      "log","monte","mersenne","poly",          4,5,6,7,
-#	      "process","support","test","lensModel");                  
-
-
-# $gM->addDepUnit("bilbau",   ["bibBuild","delft","visit","src","physics","input","source","monte","funcBase","log","tally","construct","crystal","transport","scatMat","md5","endf","process","world","work","monte","geometry","mersenne","src","xml","poly","support","weights","global","attachComp","visit","build"]);
+$gM->addSubIncDir("Model/ESSBeam");
 
 
 $gM->addDepUnit("bilbau", ["bibBuild","build","visit","chip","t1Upgrade",
@@ -266,7 +256,7 @@
 			     "scatMat","md5","endf","process","world","work",
 			     "monte","geometry","mersenne","src","xml","poly",
 			     "weights","global","attachComp",
-			     "visit","VOR"]);
+			     "visit"]);
 
 $gM->addDepUnit("sinbad",   ["sinbadBuild","visit","src","simMC",
 			     "physics","input",