Skip to content

Commit 61b4ad7

Browse files
SAnsellSAnsell
committed
Fixe of mino issues with Matrix/MLine
1 parent 8f98ada commit 61b4ad7

File tree

10 files changed

+24
-53
lines changed

10 files changed

+24
-53
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1313

1414
set(CMAKE_CXX_STANDARD 20)
1515
set(CMAKE_CXX_STANDARD_REQUIRED ON)
16-
set(CMAKE_CXX_COMPILER clang++)
16+
set(CMAKE_CXX_COMPILER g++)
1717

1818
set(CMAKE_CXX_FLAGS "-Wconversion -W -Wall -Wextra -Wno-comment -fexceptions -std=c++20 -O2")
1919
#if (${CMAKE_CXX_COMPLILER}=="g++")

‎Model/MaxIV/softimax/M1Detail.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ M1Detail::splitMainCell(Simulation& System)
159159
MonteCarlo::Object* OPtr=
160160
getCellObject(System,"MainVoid");
161161

162-
const int voidMat=mirror->getVoidMat();
162+
// const int voidMat=mirror->getVoidMat();
163163

164164
const HeadRule refHR=mirror->SurfMap::getSurfRule("RefSurf");
165165
ELog::EM<<"SN -== "<<refHR<<ELog::endDiag;

‎Model/essBuild/Bunker.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ Bunker::createSurfaces()
303303

304304
int divIndex(buildIndex+1001);
305305

306-
const double phaseStep((rightPhase-leftPhase)/static_cast<double>(nSectors));
306+
// const double phaseStep((rightPhase-leftPhase)/static_cast<double>(nSectors));
307307

308308
SMap.addMatch(divIndex,SMap.realSurf(buildIndex+3));
309309
for(size_t i=1;i<nSectors;i++)

‎System/monte/LineIntersectVisit.cxx

+3-8
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ operator<<(std::ostream& OX,const LineIntersectVisit& A)
8080

8181
LineIntersectVisit::LineIntersectVisit
8282
(const Geometry::Vec3D& Pt,const Geometry::Vec3D& uVec) :
83-
BaseVisit(),ATrack(Pt,uVec),neutIndex(0)
83+
BaseVisit(),ATrack(Pt,uVec)
8484
/*!
8585
Constructor
8686
\param Pt :: Point to start track
@@ -90,7 +90,7 @@ LineIntersectVisit::LineIntersectVisit
9090

9191
LineIntersectVisit::LineIntersectVisit
9292
(const Geometry::Line& L) :
93-
BaseVisit(),ATrack(L),neutIndex(0)
93+
BaseVisit(),ATrack(L)
9494
/*!
9595
Constructor
9696
\param L :: Line
@@ -99,8 +99,7 @@ LineIntersectVisit::LineIntersectVisit
9999

100100
LineIntersectVisit::LineIntersectVisit
101101
(const MonteCarlo::particle& N) :
102-
BaseVisit(),ATrack(N.Pos,N.uVec),
103-
neutIndex(N.ID)
102+
BaseVisit(),ATrack(N.Pos,N.uVec)
104103
/*!
105104
Constructor
106105
\param N :: Particle to track
@@ -117,7 +116,6 @@ LineIntersectVisit::setLine(const Geometry::Vec3D& Pt,
117116
*/
118117
{
119118
ATrack.setLine(Pt,Axis);
120-
neutIndex=0;
121119
return;
122120
}
123121

@@ -129,7 +127,6 @@ LineIntersectVisit::setLine(const particle& N)
129127
*/
130128
{
131129
ATrack.setLine(N.Pos,N.uVec);
132-
neutIndex=N.ID;
133130
return;
134131
}
135132

@@ -322,8 +319,6 @@ LineIntersectVisit::clearTrack()
322319
return;
323320
}
324321

325-
326-
327322
void
328323
LineIntersectVisit::procTrack(const std::vector<Geometry::Vec3D>& PtVec,
329324
const Geometry::Surface* surfID)

‎System/monte/Object.cxx

-2
Original file line numberDiff line numberDiff line change
@@ -1301,8 +1301,6 @@ Object::trackCell(const Geometry::Vec3D& Org,
13011301
return 0;
13021302
}
13031303

1304-
1305-
13061304
void
13071305
Object::makeComplement()
13081306
/*!

‎System/monteInc/LineIntersectVisit.h

+10-33
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ class LineIntersectVisit :
5151
Geometry::Line ATrack; ///< Line
5252
std::vector<Geometry::interPoint> IPts; ///
5353

54-
// std::vector<Geometry::Vec3D> PtVec; ///< Output point
55-
// std::vector<double> distVec; ///< Output distances
56-
// std::vector<int> surfNumber; ///< SurfIndexes [signed]
57-
// std::vector<const Geometry::Surface*> surfVec; ///< Surfaces
58-
long int neutIndex; ///< Particle number
59-
6054
void procTrack(const std::vector<Geometry::Vec3D>&,
6155
const Geometry::Surface*);
6256

@@ -96,33 +90,16 @@ class LineIntersectVisit :
9690
void clearTrack();
9791
const std::vector<Geometry::interPoint>& getInterVec() const
9892
{ return IPts; }
99-
100-
/// Distance Accessor
101-
// const std::vector<double>& getDistance() const
102-
// { return distVec; }
103-
104-
/*
105-
/// Point Accessor
106-
const std::vector<Geometry::Vec3D>& getPoints() const { return PtVec; }
107-
/// Pointer Accessor
108-
const std::vector<int>& getSurfIndexX() const
109-
{ return surfNumber; }
110-
/// Index Accessor
111-
const std::vector<const Geometry::Surface*>& getSurfPointers() const
112-
{ return surfVec; }
113-
*/
114-
115-
const std::vector<Geometry::interPoint>& getIntercept(const Geometry::Surface*);
116-
const std::vector<Geometry::interPoint>& getIntercept(const HeadRule&);
117-
const std::vector<Geometry::interPoint>& getIntercept
118-
(const Geometry::Surface*,const Geometry::Surface*,
119-
const int);
120-
121-
// const std::vector<Geometry::Vec3D>& getPoints(const Geometry::Surface*);
122-
// const std::vector<Geometry::Vec3D>& getPoints(const HeadRule&);
123-
// const std::vector<Geometry::Vec3D>& getPoints(const Geometry::Surface*,
124-
// const Geometry::Surface*,
125-
// const int);
93+
94+
const std::vector<Geometry::interPoint>&
95+
getIntercept(const Geometry::Surface*);
96+
97+
const std::vector<Geometry::interPoint>&
98+
getIntercept(const HeadRule&);
99+
const std::vector<Geometry::interPoint>&
100+
getIntercept(const Geometry::Surface*,
101+
const Geometry::Surface*,
102+
const int);
126103

127104
Geometry::Vec3D getPoint(const Geometry::Surface*);
128105
Geometry::Vec3D getPoint(const Geometry::Surface*,

‎System/support/Matrix.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
* File: support/Matrix.cxx
55
*
6-
* Copyright (c) 2004-2023 by Stuart Ansell
6+
* Copyright (c) 2004-2024 by Stuart Ansell
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU General Public License as published by

‎System/supportInc/Matrix.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Matrix : public MatrixBase<T>
8888
Matrix<T>& operator/=(const T&);
8989
bool operator==(const Matrix<T>&) const;
9090
bool operator!=(const Matrix<T>&) const;
91-
91+
9292
Matrix<T> Tprime() const;
9393
T Invert(); ///< LU inversion routine
9494
T factor();

‎System/supportInc/MatrixBase.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
* File: supportInc/MatrixBase.h
55
*
6-
* Copyright (c) 2004-2023 by Stuart Ansell
6+
* Copyright (c) 2004-2024 by Stuart Ansell
77
*
88
* This program is free software: you can redistribute it and/or modify
99
* it under the terms of the GNU General Public License as published by
@@ -94,8 +94,8 @@ class MatrixBase
9494
MatrixBase<T>& operator*=(const MatrixBase<T>&);
9595
MatrixBase<T>& operator*=(const T&);
9696

97-
virtual bool operator==(const MatrixBase<T>&) const;
98-
virtual bool operator!=(const MatrixBase<T>&) const;
97+
bool operator==(const MatrixBase<T>&) const;
98+
bool operator!=(const MatrixBase<T>&) const;
9999
/// Item access
100100
T item(const size_t a,const size_t b) const { return V[a][b]; }
101101

‎test/testHeadRule.cxx

+3-2
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ testHeadRule::testGetComponent()
459459
\return 0 :: success / -ve on error
460460
*/
461461
{
462-
ELog::RegMethod RegA("testHeadRule","testLevel");
462+
ELog::RegMethod RegA("testHeadRule","testGetComponent");
463463

464464
createSurfaces();
465465

@@ -741,7 +741,7 @@ testHeadRule::testIsLineValid()
741741
\retval 0 :: success / -ve on failure
742742
*/
743743
{
744-
ELog::RegMethod RegA("testHeadRule","testIsOuterLine");
744+
ELog::RegMethod RegA("testHeadRule","testIsLineValid");
745745

746746
createSurfaces();
747747

@@ -1043,6 +1043,7 @@ testHeadRule::testSurfValid()
10431043
*/
10441044
{
10451045
ELog::RegMethod RegA("testHeadRule","testSurfValid");
1046+
10461047
typedef std::tuple<std::string,const Geometry::Vec3D,std::set<int>> TTYPE;
10471048

10481049
const std::vector<TTYPE> Tests(

0 commit comments

Comments
 (0)