Updeat of stuff for warnings etc

Author: SAnsell

System/generalProcess/MainProcess.cxx

@@ -3,7 +3,7 @@
  
  * File:   generalProcess/MainProcess.cxx
  *
- * 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
@@ -699,9 +699,6 @@ buildFullSimulation(Simulation* SimPtr,
 {
   ELog::RegMethod RegA("MainProcess[F]","buildFullSimulation");
 
-  static int count(0);
-  count++;
-
   ModelSupport::objectAddition(*SimPtr,IParam);
 
   SimPtr->removeComplements();

System/geometry/SurInter.cxx

@@ -488,7 +488,7 @@ calcIntersect(const Geometry::Cone& Cne,
   Geometry::M2<double> Rprime=R.prime();
   Geometry::M2<double> lambda=MR.getEigValues();
 
-  Geometry::M2<double> CRcheck=R*lambda*Rprime;
+  //  Geometry::M2<double> CRcheck=R*lambda*Rprime;
   lambda.invert();
   Geometry::Vec2D t=R*(lambda*(Rprime*cTrans));
 

scatMatInc/SQWmaterial.h

@@ -3,7 +3,7 @@
  
  * File:   scatMatInc/SQWmaterial.h
  *
- * 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

src/SimValid.cxx

@@ -399,10 +399,7 @@ SimValid::runPoint(const Simulation& System,
   ELog::RegMethod RegA("SimValid","runPoint");
 
   std::set<Geometry::Vec3D> MultiPoint;
-  const ModelSupport::ObjSurfMap* OSMPtr =System.getOSM();
   MonteCarlo::Object* InitObj(0);
-  const Geometry::Surface* SPtr;          // Output surface
-  double aDist;       
 
   // Note for sphere that you can use X,Y,Z in any orthogonal 
   // directiron
@@ -428,7 +425,6 @@ SimValid::runPoint(const Simulation& System,
 
   // check surfaces
   ELog::EM<<"NAngle == "<<nAngle<<" :: "<<CP<<ELog::endDiag;
-  double fullTime(0.0);
   for(size_t i=0;i<nAngle;i++)
     {
       if (nAngle>10000 && i*10==nAngle)

transport/BandDetector.cxx

@@ -194,16 +194,17 @@ BandDetector::setEnergy(const double ES,const double EE)
 }
 
 void
-BandDetector::setDataSize(const int Hpts,const int Vpts,
-		      const int Epts)
+BandDetector::setDataSize(const size_t Hpts,const size_t Vpts,
+		      const size_t Epts)
   /*!
     Set the data Size
     \param Hpts :: Horizontal size
     \param Vpts :: Vertical size 
     \param Epts :: Energy size
    */
 {
-  if (Hpts>0 && Vpts>0 && (Hpts!=nH || Vpts!=nV) )
+  if (Hpts>0 && Vpts>0 &&
+      (Hpts!=nH || Vpts!=nV || Epts!=nE) )
     {
       nH=Hpts;
       nV=Vpts;
@@ -227,7 +228,7 @@ BandDetector::getAxis() const
 
 int
 BandDetector::calcCell(const MonteCarlo::particle& N,
-		   int& NH,int& NV) const
+		   size_t& NH,size_t& NV) const
   /*!
     Calc a cell
     Tracks from the point to the detector.
@@ -242,19 +243,24 @@ BandDetector::calcCell(const MonteCarlo::particle& N,
 
   const double OdotN=N.Pos.dotProd(PlnNorm);
   const double DdotN=N.uVec.dotProd(PlnNorm);
-  if (fabs(DdotN)<Geometry::parallelTol)     // Plane and line parallel
+  if (std::abs(DdotN)<Geometry::parallelTol)     // Plane and line parallel
     return 0;
   const double u=(PlnDist-OdotN)/DdotN;
   Geometry::Vec3D Pnt=N.Pos+N.uVec*u;
   // Now determine if Pnt is within detector:
   Pnt-=(Cent-H*0.5*hSize-V*0.5*vSize);
-  NH=static_cast<int>(nH*Pnt.dotProd(H)/hSize);
-  NV=static_cast<int>(nV*Pnt.dotProd(V)/vSize);
+  const double hFrac(Pnt.dotProd(H)/hSize);
+  const double vFrac(Pnt.dotProd(V)/vSize);
+  if (hFrac<0.0 || hFrac>=1.0 || vFrac<0.0 || vFrac>1.0)
+    return 0;
+  NH=static_cast<size_t>(static_cast<double>(nH)*hFrac);
+  NV=static_cast<size_t>(static_cast<double>(nV)*vFrac);
+
   ELog::EM<<"Point == "<<Pnt<<" ("<<NH<<","<<NV<<")"<<ELog::endDebug;
   ELog::EM<<"Det == "<<Cent<<" ("<<H<<","<<V<<")::"<<PlnNorm<<ELog::endDebug;
   ELog::EM<<"U == "<<u<<" "<<PlnDist<<" "<<hSize<<" "<<vSize<<ELog::endDebug;
   ELog::EM<<ELog::endDebug;
-  return (NH<0 || NV<0 || NH>=nH || NV>=nV) ? 0 : 1;
+  return 1;
 }
 
 
@@ -278,24 +284,23 @@ BandDetector::addEvent(const MonteCarlo::particle& N)
   Geometry::Vec3D Pnt=N.Pos+N.uVec*u;
   // Now determine if Pnt is within detector:
   Pnt-=(Cent-H*(hSize/2.0)-V*(vSize/2.0));
-  const int hpt=static_cast<int>(static_cast<double>(nH)*
-				 Pnt.dotProd(H)/hSize);
-  const int vpt=static_cast<int>(nV*Pnt.dotProd(V)/vSize);
-  if (hpt<0 || vpt<0 || hpt>=nH || vpt>=nV) return;
+  const size_t hpt=static_cast<size_t>
+    (static_cast<double>(nH)*Pnt.dotProd(H)/hSize);
+  const size_t vpt=static_cast<size_t>
+    (static_cast<double>(nV)*Pnt.dotProd(V)/vSize);
+  if (hpt>=nH || vpt>=nV) return;
   // Scale for (i) distance to scattering point:
   //           (ii) solid angle
   // Distance is u + travel
-  const long int ePoint=calcWavePoint(N.wavelength);
-  if (ePoint>=0 || ePoint<static_cast<long int>(EGrid.size())-1)
-    {
-      EData.get()[vpt][hpt][ePoint]+=
-	N.weight/((N.travel+u)*(N.travel+u)*fabs(DdotN));
-      nps++;
-    }
+  const size_t ePoint=calcWavePoint(N.wavelength);
+  EData.get()[vpt][hpt][ePoint]+=
+    N.weight/((N.travel+u)*(N.travel+u)*std::abs(DdotN));
+  nps++;
+
   return;
 }
 
-long int
+size_t
 BandDetector::calcWavePoint(const double W) const
   /*!
     Given the wavelength calculate the 
@@ -308,16 +313,11 @@ BandDetector::calcWavePoint(const double W) const
 
   if (EGrid.empty()) return 0;
   const double E((0.5*RefCon::h2_mneV*1e20)/(W*W)); 
-  const long int res=indexPos(EGrid,E);
-  if (res<0 || res>=static_cast<long int>(EData.shape()[0]))
-    {
-      ELog::EM<<"Bins failed on : "<<W<<" "<<
-	E<<" == "<<EGrid.front()<<" "<<EGrid.back()<<ELog::endCrit;
-    }
+  const size_t res=rangePos(EGrid,E);
   return res;
 }
 
-long int
+size_t
 BandDetector::calcEnergyPoint(const double E) const
   /*! 
     Given the wavelength calculate the 
@@ -327,7 +327,7 @@ BandDetector::calcEnergyPoint(const double E) const
   */
 {
   if (EGrid.empty()) return 0;
-  return indexPos(EGrid,E);
+  return rangePos(EGrid,E);
 }
 
 double
@@ -392,9 +392,9 @@ BandDetector::write(std::ostream& OX) const
   OX<<"#hvn "<<nH<<" "<<nV<<" from "<<nps<<std::endl;
   OX<<"#cvh "<<Cent<<" : "<<H*hSize<<" : "<<V*vSize<<std::endl;
 
-  for(int i=0;i<nV;i++)
+  for(size_t i=0;i<nV;i++)
     {
-      for(int j=0;j<nH;j++)
+      for(size_t j=0;j<nH;j++)
 	{
 	  const double E=EData.get()[i][j][EBin];
 	  OX<<E<<" ";

transportInc/BandDetector.h

@@ -75,16 +75,16 @@ class BandDetector : public Detector
   Geometry::Vec3D getRandPos() const;
   double project(const MonteCarlo::particle&,
 	        MonteCarlo::particle&) const override;
-  int calcCell(const MonteCarlo::particle&,int&,int&) const;
+  int calcCell(const MonteCarlo::particle&,size_t&,size_t&) const;
   void addEvent(const MonteCarlo::particle&) override;
 
   void clear() override;
-  void setDataSize(const int,const int,const int);
+  void setDataSize(const size_t,const size_t,const size_t);
   void setCentre(const Geometry::Vec3D&);
   void setEnergy(const double,const double);
 
-  long int calcWavePoint(const double) const;
-  long int calcEnergyPoint(const double) const;
+  size_t calcWavePoint(const double) const;
+  size_t calcEnergyPoint(const double) const;
 
   // Output stuff
   void write(std::ostream&) const override;