Index: /PSPA/PSPA.xcodeproj/project.pbxproj
===================================================================
--- /PSPA/PSPA.xcodeproj/project.pbxproj	(revision 437)
+++ /PSPA/PSPA.xcodeproj/project.pbxproj	(revision 438)
@@ -11,8 +11,12 @@
 		08211C9C16F0975600519CAA /* sectionToExecute.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08211C9816F08C7500519CAA /* sectionToExecute.cc */; };
 		08211C9D16F0975A00519CAA /* GWt_sectionToExecute.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08211C9A16F08C8300519CAA /* GWt_sectionToExecute.cc */; };
+		0826C7311851D25C00C7CD37 /* elementMultipole.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0826C7301851D25C00C7CD37 /* elementMultipole.cc */; };
+		0826C7331851D27800C7CD37 /* softwareMadx.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0826C7321851D27800C7CD37 /* softwareMadx.cc */; };
+		0826C7371851D2AC00C7CD37 /* softwareUnknown.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0826C7361851D2AC00C7CD37 /* softwareUnknown.cc */; };
+		0826C73A1851D2DB00C7CD37 /* GWt_elementMpole.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0826C7391851D2DB00C7CD37 /* GWt_elementMpole.cc */; };
+		0826C73C1851D37900C7CD37 /* GWt_sectorParameters.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0826C73B1851D37900C7CD37 /* GWt_sectorParameters.cc */; };
+		0826C7401851D3B600C7CD37 /* sectorParameters.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0826C73F1851D3B600C7CD37 /* sectorParameters.cc */; };
 		083312F816DCF81700EE2BD7 /* elementSnapshot.cc in Sources */ = {isa = PBXBuildFile; fileRef = 083312F716DCF81700EE2BD7 /* elementSnapshot.cc */; };
-		083312FB16DCF83A00EE2BD7 /* GWt_snapshot.cc in Sources */ = {isa = PBXBuildFile; fileRef = 083312FA16DCF83A00EE2BD7 /* GWt_snapshot.cc */; };
-		08866B68180FD00700E64684 /* GWt_section.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08866B66180FD00700E64684 /* GWt_section.cc */; };
-		08866B6C180FEABD00E64684 /* elementSection.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08866B6A180FEABD00E64684 /* elementSection.cc */; };
+		083312FB16DCF83A00EE2BD7 /* GWt_elementSnapshot.cc in Sources */ = {isa = PBXBuildFile; fileRef = 083312FA16DCF83A00EE2BD7 /* GWt_elementSnapshot.cc */; };
 		08866B6E180FF4E800E64684 /* libuap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 08866B6D180FF4E800E64684 /* libuap.a */; };
 		08C8899916A8469A00DD764A /* libwt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 08C8895516A8417000DD764A /* libwt.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
@@ -38,18 +42,18 @@
 		08C88A1116AE8F2B00DD764A /* particleBeam.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889DD16AE8F2B00DD764A /* particleBeam.cc */; };
 		08C88A1216AE8F2B00DD764A /* GWt_abstractElement.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F116AE8F2B00DD764A /* GWt_abstractElement.cc */; };
-		08C88A1316AE8F2B00DD764A /* GWt_beam.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F216AE8F2B00DD764A /* GWt_beam.cc */; };
-		08C88A1416AE8F2B00DD764A /* GWt_bend.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F316AE8F2B00DD764A /* GWt_bend.cc */; };
-		08C88A1516AE8F2B00DD764A /* GWt_cell.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F416AE8F2B00DD764A /* GWt_cell.cc */; };
+		08C88A1316AE8F2B00DD764A /* GWt_elementBeam.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F216AE8F2B00DD764A /* GWt_elementBeam.cc */; };
+		08C88A1416AE8F2B00DD764A /* GWt_elementBend.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F316AE8F2B00DD764A /* GWt_elementBend.cc */; };
+		08C88A1516AE8F2B00DD764A /* GWt_elementCell.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F416AE8F2B00DD764A /* GWt_elementCell.cc */; };
 		08C88A1616AE8F2B00DD764A /* GWt_console.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F516AE8F2B00DD764A /* GWt_console.cc */; };
 		08C88A1716AE8F2B00DD764A /* GWt_dialog.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F616AE8F2B00DD764A /* GWt_dialog.cc */; };
 		08C88A1816AE8F2B00DD764A /* GWt_draggableImage.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F716AE8F2B00DD764A /* GWt_draggableImage.cc */; };
-		08C88A1916AE8F2B00DD764A /* GWt_drift.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F816AE8F2B00DD764A /* GWt_drift.cc */; };
+		08C88A1916AE8F2B00DD764A /* GWt_elementDrift.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F816AE8F2B00DD764A /* GWt_elementDrift.cc */; };
 		08C88A1A16AE8F2B00DD764A /* GWt_dropZoneLigneFaisceau.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889F916AE8F2B00DD764A /* GWt_dropZoneLigneFaisceau.cc */; };
-		08C88A1C16AE8F2B00DD764A /* GWt_fit.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889FB16AE8F2B00DD764A /* GWt_fit.cc */; };
+		08C88A1C16AE8F2B00DD764A /* GWt_elementFit.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889FB16AE8F2B00DD764A /* GWt_elementFit.cc */; };
 		08C88A1D16AE8F2B00DD764A /* GWt_globalParameters.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889FC16AE8F2B00DD764A /* GWt_globalParameters.cc */; };
 		08C88A1E16AE8F2B00DD764A /* GWt_ligneFaisceau.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889FD16AE8F2B00DD764A /* GWt_ligneFaisceau.cc */; };
 		08C88A1F16AE8F2B00DD764A /* GWt_pspaApplication.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889FE16AE8F2B00DD764A /* GWt_pspaApplication.cc */; };
-		08C88A2016AE8F2B00DD764A /* GWt_rfgun.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889FF16AE8F2B00DD764A /* GWt_rfgun.cc */; };
-		08C88A2116AE8F2B00DD764A /* GWt_soleno.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C88A0016AE8F2B00DD764A /* GWt_soleno.cc */; };
+		08C88A2016AE8F2B00DD764A /* GWt_elementRfgun.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C889FF16AE8F2B00DD764A /* GWt_elementRfgun.cc */; };
+		08C88A2116AE8F2B00DD764A /* GWt_elementSoleno.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08C88A0016AE8F2B00DD764A /* GWt_elementSoleno.cc */; };
 		08EC90A6170584C800F74273 /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 08C8897A16A842A900DD764A /* libboost_regex.dylib */; };
 		08FBB13B16D3DAC8002B087C /* softwareGenerator.cc in Sources */ = {isa = PBXBuildFile; fileRef = 08FBB13716D3DAC8002B087C /* softwareGenerator.cc */; };
@@ -84,12 +88,20 @@
 		08211C9816F08C7500519CAA /* sectionToExecute.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sectionToExecute.cc; sourceTree = "<group>"; };
 		08211C9A16F08C8300519CAA /* GWt_sectionToExecute.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_sectionToExecute.cc; sourceTree = "<group>"; };
+		0826C72F1851D25000C7CD37 /* elementMultipole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = elementMultipole.h; sourceTree = "<group>"; };
+		0826C7301851D25C00C7CD37 /* elementMultipole.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = elementMultipole.cc; sourceTree = "<group>"; };
+		0826C7321851D27800C7CD37 /* softwareMadx.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = softwareMadx.cc; sourceTree = "<group>"; };
+		0826C7341851D28400C7CD37 /* softwareMadx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = softwareMadx.h; sourceTree = "<group>"; };
+		0826C7351851D29D00C7CD37 /* softwareUnknown.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = softwareUnknown.h; sourceTree = "<group>"; };
+		0826C7361851D2AC00C7CD37 /* softwareUnknown.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = softwareUnknown.cc; sourceTree = "<group>"; };
+		0826C7381851D2CF00C7CD37 /* GWt_elementMpole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_elementMpole.h; sourceTree = "<group>"; };
+		0826C7391851D2DB00C7CD37 /* GWt_elementMpole.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_elementMpole.cc; sourceTree = "<group>"; };
+		0826C73B1851D37900C7CD37 /* GWt_sectorParameters.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_sectorParameters.cc; sourceTree = "<group>"; };
+		0826C73D1851D38B00C7CD37 /* GWt_sectorParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_sectorParameters.h; sourceTree = "<group>"; };
+		0826C73E1851D3AD00C7CD37 /* sectorParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sectorParameters.h; sourceTree = "<group>"; };
+		0826C73F1851D3B600C7CD37 /* sectorParameters.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sectorParameters.cc; sourceTree = "<group>"; };
 		083312F616DCF80D00EE2BD7 /* elementSnapshot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = elementSnapshot.h; sourceTree = "<group>"; };
 		083312F716DCF81700EE2BD7 /* elementSnapshot.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = elementSnapshot.cc; sourceTree = "<group>"; };
-		083312F916DCF83000EE2BD7 /* GWt_snapshot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_snapshot.h; sourceTree = "<group>"; };
-		083312FA16DCF83A00EE2BD7 /* GWt_snapshot.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_snapshot.cc; sourceTree = "<group>"; };
-		08866B65180FCF5F00E64684 /* GWt_section.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_section.h; sourceTree = "<group>"; };
-		08866B66180FD00700E64684 /* GWt_section.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_section.cc; sourceTree = "<group>"; };
-		08866B69180FEA6C00E64684 /* elementSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = elementSection.h; sourceTree = "<group>"; };
-		08866B6A180FEABD00E64684 /* elementSection.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = elementSection.cc; sourceTree = "<group>"; };
+		083312F916DCF83000EE2BD7 /* GWt_elementSnapshot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_elementSnapshot.h; sourceTree = "<group>"; };
+		083312FA16DCF83A00EE2BD7 /* GWt_elementSnapshot.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_elementSnapshot.cc; sourceTree = "<group>"; };
 		08866B6D180FF4E800E64684 /* libuap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libuap.a; path = "../accelerator-ml-code/uap/trunk/lib/libuap.a"; sourceTree = "<group>"; };
 		08C888C516A83A9A00DD764A /* PSPA */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = PSPA; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -168,34 +180,33 @@
 		08C889DD16AE8F2B00DD764A /* particleBeam.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = particleBeam.cc; sourceTree = "<group>"; };
 		08C889E016AE8F2B00DD764A /* GWt_abstractElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_abstractElement.h; sourceTree = "<group>"; };
-		08C889E116AE8F2B00DD764A /* GWt_beam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_beam.h; sourceTree = "<group>"; };
-		08C889E216AE8F2B00DD764A /* GWt_bend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_bend.h; sourceTree = "<group>"; };
-		08C889E316AE8F2B00DD764A /* GWt_cell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_cell.h; sourceTree = "<group>"; };
+		08C889E116AE8F2B00DD764A /* GWt_elementBeam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_elementBeam.h; sourceTree = "<group>"; };
+		08C889E216AE8F2B00DD764A /* GWt_elementBend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_elementBend.h; sourceTree = "<group>"; };
+		08C889E316AE8F2B00DD764A /* GWt_elementCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_elementCell.h; sourceTree = "<group>"; };
 		08C889E416AE8F2B00DD764A /* GWt_console.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = GWt_console.h; sourceTree = "<group>"; tabWidth = 2; };
 		08C889E516AE8F2B00DD764A /* GWt_dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_dialog.h; sourceTree = "<group>"; };
 		08C889E616AE8F2B00DD764A /* GWt_draggableImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_draggableImage.h; sourceTree = "<group>"; };
-		08C889E716AE8F2B00DD764A /* GWt_drift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_drift.h; sourceTree = "<group>"; };
+		08C889E716AE8F2B00DD764A /* GWt_elementDrift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_elementDrift.h; sourceTree = "<group>"; };
 		08C889E816AE8F2B00DD764A /* GWt_dropZoneLigneFaisceau.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_dropZoneLigneFaisceau.h; sourceTree = "<group>"; };
-		08C889EA16AE8F2B00DD764A /* GWt_fit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_fit.h; sourceTree = "<group>"; };
+		08C889EA16AE8F2B00DD764A /* GWt_elementFit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_elementFit.h; sourceTree = "<group>"; };
 		08C889EB16AE8F2B00DD764A /* GWt_globalParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_globalParameters.h; sourceTree = "<group>"; };
 		08C889EC16AE8F2B00DD764A /* GWt_ligneFaisceau.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_ligneFaisceau.h; sourceTree = "<group>"; };
 		08C889ED16AE8F2B00DD764A /* GWt_pspaApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_pspaApplication.h; sourceTree = "<group>"; };
-		08C889EE16AE8F2B00DD764A /* GWt_rfgun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_rfgun.h; sourceTree = "<group>"; };
-		08C889EF16AE8F2B00DD764A /* GWt_soleno.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_soleno.h; sourceTree = "<group>"; };
+		08C889EE16AE8F2B00DD764A /* GWt_elementRfgun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_elementRfgun.h; sourceTree = "<group>"; };
+		08C889EF16AE8F2B00DD764A /* GWt_elementSoleno.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWt_elementSoleno.h; sourceTree = "<group>"; };
 		08C889F116AE8F2B00DD764A /* GWt_abstractElement.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_abstractElement.cc; sourceTree = "<group>"; };
-		08C889F216AE8F2B00DD764A /* GWt_beam.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_beam.cc; sourceTree = "<group>"; };
-		08C889F316AE8F2B00DD764A /* GWt_bend.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_bend.cc; sourceTree = "<group>"; };
-		08C889F416AE8F2B00DD764A /* GWt_cell.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_cell.cc; sourceTree = "<group>"; };
+		08C889F216AE8F2B00DD764A /* GWt_elementBeam.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_elementBeam.cc; sourceTree = "<group>"; };
+		08C889F316AE8F2B00DD764A /* GWt_elementBend.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_elementBend.cc; sourceTree = "<group>"; };
+		08C889F416AE8F2B00DD764A /* GWt_elementCell.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_elementCell.cc; sourceTree = "<group>"; };
 		08C889F516AE8F2B00DD764A /* GWt_console.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_console.cc; sourceTree = "<group>"; };
 		08C889F616AE8F2B00DD764A /* GWt_dialog.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_dialog.cc; sourceTree = "<group>"; };
 		08C889F716AE8F2B00DD764A /* GWt_draggableImage.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_draggableImage.cc; sourceTree = "<group>"; };
-		08C889F816AE8F2B00DD764A /* GWt_drift.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_drift.cc; sourceTree = "<group>"; };
+		08C889F816AE8F2B00DD764A /* GWt_elementDrift.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_elementDrift.cc; sourceTree = "<group>"; };
 		08C889F916AE8F2B00DD764A /* GWt_dropZoneLigneFaisceau.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_dropZoneLigneFaisceau.cc; sourceTree = "<group>"; };
-		08C889FB16AE8F2B00DD764A /* GWt_fit.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_fit.cc; sourceTree = "<group>"; };
+		08C889FB16AE8F2B00DD764A /* GWt_elementFit.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_elementFit.cc; sourceTree = "<group>"; };
 		08C889FC16AE8F2B00DD764A /* GWt_globalParameters.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_globalParameters.cc; sourceTree = "<group>"; };
 		08C889FD16AE8F2B00DD764A /* GWt_ligneFaisceau.cc */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_ligneFaisceau.cc; sourceTree = "<group>"; tabWidth = 2; };
 		08C889FE16AE8F2B00DD764A /* GWt_pspaApplication.cc */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_pspaApplication.cc; sourceTree = "<group>"; tabWidth = 2; };
-		08C889FF16AE8F2B00DD764A /* GWt_rfgun.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_rfgun.cc; sourceTree = "<group>"; };
-		08C88A0016AE8F2B00DD764A /* GWt_soleno.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_soleno.cc; sourceTree = "<group>"; };
-		08EC90A517034F4E00F74273 /* getAbstrac */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = getAbstrac; sourceTree = "<group>"; };
+		08C889FF16AE8F2B00DD764A /* GWt_elementRfgun.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_elementRfgun.cc; sourceTree = "<group>"; };
+		08C88A0016AE8F2B00DD764A /* GWt_elementSoleno.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GWt_elementSoleno.cc; sourceTree = "<group>"; };
 		08FBB13316D3DABC002B087C /* softwareGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = softwareGenerator.h; sourceTree = "<group>"; };
 		08FBB13416D3DABC002B087C /* softwareParmela.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = softwareParmela.h; sourceTree = "<group>"; };
@@ -330,4 +341,5 @@
 				08C889B616AE8F2B00DD764A /* carteChamp.h */,
 				08C889B716AE8F2B00DD764A /* dataManager.h */,
+				0826C72F1851D25000C7CD37 /* elementMultipole.h */,
 				08C889B816AE8F2B00DD764A /* elementBeam.h */,
 				08C889B916AE8F2B00DD764A /* elementBend.h */,
@@ -335,6 +347,8 @@
 				08C889BB16AE8F2B00DD764A /* elementDrift.h */,
 				08C889BC16AE8F2B00DD764A /* elementFit.h */,
+				0826C7351851D29D00C7CD37 /* softwareUnknown.h */,
 				08C889BD16AE8F2B00DD764A /* elementRfgun.h */,
 				08FBB14716D3DB75002B087C /* abstractSoftware.h */,
+				0826C7341851D28400C7CD37 /* softwareMadx.h */,
 				08FBB14216D3DB1C002B087C /* generatorParticle.h */,
 				083312F616DCF80D00EE2BD7 /* elementSnapshot.h */,
@@ -353,9 +367,9 @@
 				08C889CA16AE8F2B00DD764A /* trivaluedBool.h */,
 				08211C9216EF2E9600519CAA /* sectionToExecute.h */,
+				0826C73E1851D3AD00C7CD37 /* sectorParameters.h */,
 				08FBB13316D3DABC002B087C /* softwareGenerator.h */,
 				08FBB13416D3DABC002B087C /* softwareParmela.h */,
 				08FBB13516D3DABC002B087C /* softwareTest.h */,
 				08FBB13616D3DABC002B087C /* softwareTransport.h */,
-				08866B69180FEA6C00E64684 /* elementSection.h */,
 			);
 			path = include;
@@ -367,9 +381,13 @@
 				08C889CD16AE8F2B00DD764A /* abstractElement.cc */,
 				08FBB14816D3DB7E002B087C /* abstractSoftware.cc */,
+				0826C7301851D25C00C7CD37 /* elementMultipole.cc */,
+				0826C73F1851D3B600C7CD37 /* sectorParameters.cc */,
 				08C889CE16AE8F2B00DD764A /* bareParticle.cc */,
 				08C889CF16AE8F2B00DD764A /* beam2Moments.cc */,
+				0826C7321851D27800C7CD37 /* softwareMadx.cc */,
 				08C889D016AE8F2B00DD764A /* dataManager.cc */,
 				08C889D116AE8F2B00DD764A /* elementBeam.cc */,
 				08C889D216AE8F2B00DD764A /* elementBend.cc */,
+				0826C7361851D2AC00C7CD37 /* softwareUnknown.cc */,
 				08C889D316AE8F2B00DD764A /* elementCell.cc */,
 				08C889D416AE8F2B00DD764A /* elementDrift.cc */,
@@ -388,5 +406,4 @@
 				08FBB13A16D3DAC8002B087C /* softwareTransport.cc */,
 				08C889DD16AE8F2B00DD764A /* particleBeam.cc */,
-				08866B6A180FEABD00E64684 /* elementSection.cc */,
 			);
 			path = src;
@@ -406,25 +423,26 @@
 			children = (
 				08C889E016AE8F2B00DD764A /* GWt_abstractElement.h */,
-				08C889E116AE8F2B00DD764A /* GWt_beam.h */,
-				08C889E216AE8F2B00DD764A /* GWt_bend.h */,
-				08C889E316AE8F2B00DD764A /* GWt_cell.h */,
+				08C889E116AE8F2B00DD764A /* GWt_elementBeam.h */,
+				08C889E216AE8F2B00DD764A /* GWt_elementBend.h */,
+				08C889E316AE8F2B00DD764A /* GWt_elementCell.h */,
+				08FBB13F16D3DAF8002B087C /* GWt_elementLigneFaisceau.h */,
+				08C889E716AE8F2B00DD764A /* GWt_elementDrift.h */,
+				083312F916DCF83000EE2BD7 /* GWt_elementSnapshot.h */,
+				0826C7381851D2CF00C7CD37 /* GWt_elementMpole.h */,
+				08C889EA16AE8F2B00DD764A /* GWt_elementFit.h */,
+				08C889EE16AE8F2B00DD764A /* GWt_elementRfgun.h */,
+				08C889EF16AE8F2B00DD764A /* GWt_elementSoleno.h */,
 				08C889E416AE8F2B00DD764A /* GWt_console.h */,
 				08C889E516AE8F2B00DD764A /* GWt_dialog.h */,
-				08FBB13F16D3DAF8002B087C /* GWt_elementLigneFaisceau.h */,
 				08C889E616AE8F2B00DD764A /* GWt_draggableImage.h */,
-				08C889E716AE8F2B00DD764A /* GWt_drift.h */,
-				083312F916DCF83000EE2BD7 /* GWt_snapshot.h */,
 				08FBB14A16D3DB99002B087C /* GWt_abstractElementFactory.h */,
 				08C889E816AE8F2B00DD764A /* GWt_dropZoneLigneFaisceau.h */,
-				08C889EA16AE8F2B00DD764A /* GWt_fit.h */,
 				08C889EB16AE8F2B00DD764A /* GWt_globalParameters.h */,
 				08211C9716EFB53000519CAA /* GWt_sectionToExecute.h */,
 				08FBB14416D3DB52002B087C /* GWt_softwarePanel.h */,
 				08C889EC16AE8F2B00DD764A /* GWt_ligneFaisceau.h */,
+				0826C73D1851D38B00C7CD37 /* GWt_sectorParameters.h */,
 				08FBB14F16D3DBC6002B087C /* GWt_serverFileSelector.h */,
 				08C889ED16AE8F2B00DD764A /* GWt_pspaApplication.h */,
-				08C889EE16AE8F2B00DD764A /* GWt_rfgun.h */,
-				08C889EF16AE8F2B00DD764A /* GWt_soleno.h */,
-				08866B65180FCF5F00E64684 /* GWt_section.h */,
 			);
 			path = include;
@@ -436,25 +454,25 @@
 				08C889F116AE8F2B00DD764A /* GWt_abstractElement.cc */,
 				08FBB14B16D3DBA1002B087C /* GWt_abstractElementFactory.cc */,
-				083312FA16DCF83A00EE2BD7 /* GWt_snapshot.cc */,
-				08C889F216AE8F2B00DD764A /* GWt_beam.cc */,
-				08C889F316AE8F2B00DD764A /* GWt_bend.cc */,
+				083312FA16DCF83A00EE2BD7 /* GWt_elementSnapshot.cc */,
+				08C889F216AE8F2B00DD764A /* GWt_elementBeam.cc */,
+				08C88A0016AE8F2B00DD764A /* GWt_elementSoleno.cc */,
+				08C889F316AE8F2B00DD764A /* GWt_elementBend.cc */,
+				08C889FB16AE8F2B00DD764A /* GWt_elementFit.cc */,
+				08C889FF16AE8F2B00DD764A /* GWt_elementRfgun.cc */,
+				08FBB14016D3DB04002B087C /* GWt_elementLigneFaisceau.cc */,
+				08C889F816AE8F2B00DD764A /* GWt_elementDrift.cc */,
+				08C889F416AE8F2B00DD764A /* GWt_elementCell.cc */,
+				08FBB14516D3DB5B002B087C /* GWt_softwarePanel.cc */,
 				08FBB14D16D3DBBD002B087C /* GWt_serverFileSelector.cc */,
-				08FBB14016D3DB04002B087C /* GWt_elementLigneFaisceau.cc */,
-				08C889F416AE8F2B00DD764A /* GWt_cell.cc */,
-				08FBB14516D3DB5B002B087C /* GWt_softwarePanel.cc */,
-				08EC90A517034F4E00F74273 /* getAbstrac */,
+				0826C73B1851D37900C7CD37 /* GWt_sectorParameters.cc */,
 				08C889F516AE8F2B00DD764A /* GWt_console.cc */,
 				08C889F616AE8F2B00DD764A /* GWt_dialog.cc */,
 				08C889F716AE8F2B00DD764A /* GWt_draggableImage.cc */,
-				08C889F816AE8F2B00DD764A /* GWt_drift.cc */,
+				0826C7391851D2DB00C7CD37 /* GWt_elementMpole.cc */,
 				08C889F916AE8F2B00DD764A /* GWt_dropZoneLigneFaisceau.cc */,
-				08C889FB16AE8F2B00DD764A /* GWt_fit.cc */,
 				08C889FC16AE8F2B00DD764A /* GWt_globalParameters.cc */,
 				08211C9A16F08C8300519CAA /* GWt_sectionToExecute.cc */,
 				08C889FD16AE8F2B00DD764A /* GWt_ligneFaisceau.cc */,
 				08C889FE16AE8F2B00DD764A /* GWt_pspaApplication.cc */,
-				08C889FF16AE8F2B00DD764A /* GWt_rfgun.cc */,
-				08C88A0016AE8F2B00DD764A /* GWt_soleno.cc */,
-				08866B66180FD00700E64684 /* GWt_section.cc */,
 			);
 			path = src;
@@ -518,6 +536,6 @@
 				08C88A0516AE8F2B00DD764A /* elementBeam.cc in Sources */,
 				08C88A0616AE8F2B00DD764A /* elementBend.cc in Sources */,
-				08866B68180FD00700E64684 /* GWt_section.cc in Sources */,
 				08C88A0716AE8F2B00DD764A /* elementCell.cc in Sources */,
+				0826C73A1851D2DB00C7CD37 /* GWt_elementMpole.cc in Sources */,
 				08C88A0816AE8F2B00DD764A /* elementDrift.cc in Sources */,
 				08C88A0916AE8F2B00DD764A /* elementFit.cc in Sources */,
@@ -530,30 +548,34 @@
 				08C88A1116AE8F2B00DD764A /* particleBeam.cc in Sources */,
 				08C88A1216AE8F2B00DD764A /* GWt_abstractElement.cc in Sources */,
-				08C88A1316AE8F2B00DD764A /* GWt_beam.cc in Sources */,
-				08C88A1416AE8F2B00DD764A /* GWt_bend.cc in Sources */,
-				08C88A1516AE8F2B00DD764A /* GWt_cell.cc in Sources */,
+				0826C7311851D25C00C7CD37 /* elementMultipole.cc in Sources */,
+				08C88A1316AE8F2B00DD764A /* GWt_elementBeam.cc in Sources */,
+				08C88A1416AE8F2B00DD764A /* GWt_elementBend.cc in Sources */,
+				08C88A1516AE8F2B00DD764A /* GWt_elementCell.cc in Sources */,
 				08C88A1616AE8F2B00DD764A /* GWt_console.cc in Sources */,
 				08C88A1716AE8F2B00DD764A /* GWt_dialog.cc in Sources */,
 				08C88A1816AE8F2B00DD764A /* GWt_draggableImage.cc in Sources */,
-				08C88A1916AE8F2B00DD764A /* GWt_drift.cc in Sources */,
+				08C88A1916AE8F2B00DD764A /* GWt_elementDrift.cc in Sources */,
 				08C88A1A16AE8F2B00DD764A /* GWt_dropZoneLigneFaisceau.cc in Sources */,
-				08C88A1C16AE8F2B00DD764A /* GWt_fit.cc in Sources */,
+				08C88A1C16AE8F2B00DD764A /* GWt_elementFit.cc in Sources */,
 				08C88A1D16AE8F2B00DD764A /* GWt_globalParameters.cc in Sources */,
 				08C88A1E16AE8F2B00DD764A /* GWt_ligneFaisceau.cc in Sources */,
 				08C88A1F16AE8F2B00DD764A /* GWt_pspaApplication.cc in Sources */,
-				08C88A2016AE8F2B00DD764A /* GWt_rfgun.cc in Sources */,
-				08C88A2116AE8F2B00DD764A /* GWt_soleno.cc in Sources */,
-				08866B6C180FEABD00E64684 /* elementSection.cc in Sources */,
+				08C88A2016AE8F2B00DD764A /* GWt_elementRfgun.cc in Sources */,
+				08C88A2116AE8F2B00DD764A /* GWt_elementSoleno.cc in Sources */,
 				08FBB13B16D3DAC8002B087C /* softwareGenerator.cc in Sources */,
 				08FBB13C16D3DAC8002B087C /* softwareParmela.cc in Sources */,
+				0826C7371851D2AC00C7CD37 /* softwareUnknown.cc in Sources */,
 				08FBB13D16D3DAC8002B087C /* softwareTest.cc in Sources */,
 				08FBB13E16D3DAC8002B087C /* softwareTransport.cc in Sources */,
 				08FBB14116D3DB04002B087C /* GWt_elementLigneFaisceau.cc in Sources */,
 				08FBB14616D3DB5B002B087C /* GWt_softwarePanel.cc in Sources */,
+				0826C73C1851D37900C7CD37 /* GWt_sectorParameters.cc in Sources */,
+				0826C7331851D27800C7CD37 /* softwareMadx.cc in Sources */,
 				08FBB14916D3DB7E002B087C /* abstractSoftware.cc in Sources */,
 				08FBB14C16D3DBA1002B087C /* GWt_abstractElementFactory.cc in Sources */,
 				08FBB14E16D3DBBD002B087C /* GWt_serverFileSelector.cc in Sources */,
+				0826C7401851D3B600C7CD37 /* sectorParameters.cc in Sources */,
 				083312F816DCF81700EE2BD7 /* elementSnapshot.cc in Sources */,
-				083312FB16DCF83A00EE2BD7 /* GWt_snapshot.cc in Sources */,
+				083312FB16DCF83A00EE2BD7 /* GWt_elementSnapshot.cc in Sources */,
 				08211C9C16F0975600519CAA /* sectionToExecute.cc in Sources */,
 				08211C9D16F0975A00519CAA /* GWt_sectionToExecute.cc in Sources */,
