Changeset 156 in PSPA

Timestamp:

Dec 8, 2012, 6:30:03 PM (12 years ago)

Author:

lemeur

Message:

renommage GWt_initialBeam en GWt_rfgun

Location:

Interface_Web/trunk/pspaWT

Files:

• cmt/requirements (modified) (1 diff)
• include/GWt_initialBeam.h (deleted)
• include/GWt_rfgun.h (added)
• src/GWt_LigneFaisceau.cc (modified) (1 diff)
• src/GWt_abstractElement.cc (modified) (2 diffs)
• src/GWt_initialBeam.cc (deleted)
• src/GWt_rfgun.cc (added)

Interface_Web/trunk/pspaWT/cmt/requirements

@@ -22 +22 @@
 #macro PSPSLib_linkopts     " -L${PSPAWTROOT}/$(Platform_bin) -lPSPSLib "
 
-application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_initialBeam.cc GWt_soleno.cc GWt_bend.cc GWt_globalParameters.cc GWt_drift.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementRfgun.cc elementSoleno.cc elementBend.cc globalParameters.cc abstractElement.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc GWt_dialog.cc nomdElements.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags} "'
+application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_rfgun.cc GWt_soleno.cc GWt_bend.cc GWt_globalParameters.cc GWt_drift.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementRfgun.cc elementSoleno.cc elementBend.cc globalParameters.cc abstractElement.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc GWt_dialog.cc nomdElements.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags} "'
 
 macro DrawWt_linkopts " ${PSPSLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"

Interface_Web/trunk/pspaWT/src/GWt_LigneFaisceau.cc

@@ -4 +4 @@
 #include "GWt_LigneFaisceau.h"
 #include "GWt_drift.h"
-#include "GWt_initialBeam.h"
+#include "GWt_rfgun.h"
 #include "GWt_cell.h"
 #include "GWt_soleno.h"

Interface_Web/trunk/pspaWT/src/GWt_abstractElement.cc

@@ -1 +1 @@
 
 #include "GWt_abstractElement.h"
-#include "GWt_initialBeam.h"
+#include "GWt_rfgun.h"
 #include "GWt_drift.h"
 #include "GWt_cell.h"
@@ -81 +81 @@
 
   switch (  eType ) {
-  case RFgun : return new GWt_initialBeam(ps,ptr);
+  case RFgun : return new GWt_rfgun(ps,ptr);
   case drift : return new GWt_drift(ps,ptr);
   case cell  : return new GWt_cell(ps,ptr);