Changeset 40 in PSPA for Interface_Web/trunk/pspaWT/include

Timestamp:

Oct 28, 2012, 3:06:57 PM (12 years ago)

Author:

lemeur

Message:

renommage elements

Location:

Interface_Web/trunk/pspaWT/include

Files:

• bendDefinition.h (deleted)
• cellDefinition.h (deleted)
• driftDefinition.h (deleted)
• elementBend.h (added)
• elementDrift.h (added)
• elementInitialBeam.h (added)
• elementSoleno.h (added)
• elementsCollection.h (modified) (3 diffs)
• initialBeamDefinition.h (deleted)
• soleDefinition.h (deleted)

Interface_Web/trunk/pspaWT/include/elementsCollection.h

@@ -6 +6 @@
 #include <string>
 #include "abstractElementDefinition.h"
-#include "driftDefinition.h"
-#include "initialBeamDefinition.h"
+#include "elementDrift.h"
+#include "elementInitialBeam.h"
 #include "elementCell.h"
-//#include "cellDefinition.h"
-//#include "bendDefinition.h"
-//#include "soleDefinition.h"
 
 
@@ -42 +39 @@
 inline AbstractElementDefinition* createNewDrift()
  {
-   elements_.push_back(new DriftDefinition());
+   elements_.push_back(new elementDrift());
    return elements_.back();
  }
@@ -48 +45 @@
 inline AbstractElementDefinition* createNewInitialBeam()
  {
-   elements_.push_back(new initialBeamDefinition());
+   elements_.push_back(new elementInitialBeam());
    return elements_.back();
  }