← Back to branch summary

~christopher-hunt08/maus/maus_integrated_kalman

« back to all changes in this revision

Viewing changes to src/legacy/Interface/ThreeDFieldMap.cc

merging in changes in merge branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/legacy/Interface/ThreeDFieldMap.cc
200
200
{
201
201
        if(symmetry == "Quadrupole" )      _symmetry = quadrupole;
202
202
        else if(symmetry == "Dipole")      _symmetry = dipole;
 
203
        else if(symmetry == "Solenoid")    _symmetry = solenoid;
203
204
        else                               _symmetry = none;
204
205
}
205
206
 
226
227
                if(Point[0] < 0) pointAndScale[4] = -1;
227
228
                if(Point[1] < 0) pointAndScale[6] = -1;
228
229
        }
 
230
        else if(_symmetry == solenoid)
 
231
        {
 
232
                pointAndScale[0] = fabs(Point[0]);      // f(x) = f(-x)
 
233
                pointAndScale[1] = fabs(Point[1]);      // f(y) = f(-y)
 
234
                pointAndScale[2] = Point[2];            // The symetry is radial, not along z
 
235
        }
229
236
 
230
237
//      for(int i=0; i<7; i++) std::cout << " @" << pointAndScale[i] << "@ ";
231
238
        return pointAndScale;