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


Ignore:
Timestamp:
Oct 29, 2012, 7:12:08 PM (12 years ago)
Author:
lemeur
Message:

ajustements divers

Location:
Interface_Web/trunk/pspaWT/include
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • Interface_Web/trunk/pspaWT/include/abstractElement.h

    r41 r45  
    1818 protected:
    1919
    20   double phaseStep_; // a recuperer dans les parametres globaux (methode setPhaseStep)
     20  int nbParam_;
     21  string* parametersString_;
     22
     23
     24
     25  //  double phaseStep_; // a recuperer dans les parametres globaux (methode setPhaseStep)
    2126  double phaseStepMax_;
    2227
    … …  
    3641  void setDefaultValues()
    3742  {
     43    nbParam_ = 2;
    3844      defaultLength_ = 0.0;
    3945      defaultAperture_ = 1.e+6;
    40     phaseStep_ = 0.0;
    4146    phaseStepMax_ = 10.;
    4247  }
    … …  
    7378virtual  ~abstractElement() {;}
    7479
    75   void setPhaseStep(double ph) { phaseStep_ = ph;}
     80 virtual void setPhaseStep(double ph) { cout << " setPhaseStep : ce n'est pas celui la qu'il faut ! " ; return;}
    7681
    7782

  • Interface_Web/trunk/pspaWT/include/elementBend.h

    r41 r45  
    2929  ~elementBend() {;}
    3030
     31
     32virtual void setParametersString(string* param)
     33{
     34    ostringstream sortie;
     35    cout << " BEND :setParametersString non programme " << endl;
     36    return sortie.str();
     37}
     38
     39virtual string* getParametersString() const
     40{
     41    ostringstream sortie;
     42    cout << " BEND :getParametersString non programme " << endl;
     43    return sortie.str();
     44}
     45
    3146virtual  string parmelaOutputFlow() const
    3247  {

  • Interface_Web/trunk/pspaWT/include/elementCell.h

    r42 r45  
    55#include "abstractElement.h"
    66
     7using namespace std;
    78
    89
    … …  
    1011{
    1112
    12   int nbParam_;
    13   string* parametersString_;
     13  //  int nbParam_;
     14  // string* parametersString_;
    1415
    1516

  • Interface_Web/trunk/pspaWT/include/elementDrift.h

    r42 r45  
    11#ifndef DRIFTDEFINITION_SEEN
    22#define DRIFTDEFINITION_SEEN
     3#include <string>
    34
    45#include "abstractElement.h"
    56
    67
     8using namespace std;
    79
    810class elementDrift : public abstractElement
    911{
    1012
    11   int nbParam_;
    12   string* parametersString_;
     13  //  int nbParam_;
     14  //  string* parametersString_;
    1315
    1416 public:

  • Interface_Web/trunk/pspaWT/include/elementInitialBeam.h

    r42 r45  
    33
    44#include <string>
     5#include <iostream>
     6
    57#include "abstractElement.h"
    68
     9using namespace std;
    710
    811class elementInitialBeam : public abstractElement
    912{
    1013
    11   int nbParam_;
    12   string* parametersString_;
     14  //  int nbParam_;
     15  //  string* parametersString_;
    1316
     17  double defaultPhaseStep_;
    1418  int defaultNmacrop_;
    1519  double defaultSigma_t_;
    … …  
    1923  double defaultNb_true_particles_;
    2024
     25  double phaseStep_; // a recuperer dans les parametres globaux (methode setPhaseStep)
    2126  int nmacrop_;
    2227  double sigma_t_; // picoseconds
    … …  
    3641  ~elementInitialBeam() {;}
    3742
     43  virtual void setPhaseStep(double ph) { cout << " bon setphasestep = " << ph << endl; phaseStep_ = ph;}
     44
    3845
    3946  virtual string* getParametersString() const;

  • Interface_Web/trunk/pspaWT/include/elementSoleno.h

    r41 r45  
    3030  ~elementSoleno() {;}
    3131
     32virtual void setParametersString(string* param)
     33{
     34    ostringstream sortie;
     35    cout << " SOLENO setParametersString non programme " << endl;
     36    return sortie.str();
     37}
     38
     39 virtual string* getParametersString() const
     40 {
     41    ostringstream sortie;
     42    cout << " SOLENO getParametersString non programme " << endl;
     43    return sortie.str();
     44 }
     45
    3246virtual  string parmelaOutputFlow() const
    3347  {
    3448    ostringstream sortie;
    35     cout << " SOLE sortie parmela non progerammee " << endl;
     49    cout << " SOLENO sortie parmela non progerammee " << endl;
    3650    return sortie.str();
    3751  }
Note: See TracChangeset for help on using the changeset viewer.