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


Ignore:
Timestamp:
Nov 16, 2012, 2:19:21 PM (12 years ago)
Author:
lemeur
Message:

introduction element solenoid

Location:
Interface_Web/trunk/pspaWT/include
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

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

    r41 r82  
    3232
    3333  GWt_drift() {;}
    34   ~GWt_drift() {;}
    3534
    3635 public:
    3736
     37
    3838  GWt_drift(PspaApplication* ps, abstractElement* elem, string image);
     39
     40  ~GWt_drift() {;}
     41
    3942  WPushButton* getButton();
    4043  WDialog* getDialog();

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

    r50 r82  
    4040  void setDefaultValues()
    4141  {
     42    label_ = "";
    4243    nbParam_ = 2;
    4344      defaultLength_ = 0.0;
    … …  
    106107
    107108 virtual string parmelaOutputFlow() const =0;
     109 virtual string transportOutputFlow() const =0;
    108110
    109111

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

    r59 r82  
    2525  particleBeam currentBeam_;
    2626
    27     vector<sectionToExecute*> jobList_;
     27  //    vector<sectionToExecute*> jobList_;
    2828
    2929  void createInputFileParmela( unsigned int indexDeb, unsigned int indexFin);
    … …  
    3737  ~dataManager()
    3838{
    39   unsigned k;
    40 
    41   for (k=0; k < jobList_.size();k++)
    42     {
    43       if ( jobList_[k] != NULL ) delete jobList_[k];
    44     }
     39  /* unsigned k; */
     40  /* for (k=0; k < jobList_.size();k++) */
     41  /*   { */
     42  /*     if ( jobList_[k] != NULL ) delete jobList_[k]; */
     43  /*   } */
    4544}
    4645
    … …  
    5049  inline particleBeam& getCurrentBeam() {return currentBeam_;}
    5150
    52     void addSectionToExecute(int debut, int fin, nomDeLogiciel prog);
    53     void clearSectionToExecute();
     51  //    void addSectionToExecute(int debut, int fin, nomDeLogiciel prog);
     52  //    void clearSectionToExecute();
    5453 
    5554  abstractElement* addElement(nomdElement elemType);
    … …  
    5756  abstractElement* addDrift();
    5857  abstractElement* addInitialBeam();
     58  abstractElement* addSoleno();
     59  void initializeExecution();
    5960  string executeTransport( unsigned int indexDeb, unsigned int indexFin);
    6061  string executeParmela( unsigned int indexDeb, unsigned int indexFin);
    61   string executeAll();
     62  //  string executeAll();
    6263  void saveAll();
    6364  void restoreAll();

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

    r50 r82  
    5151  }
    5252
     53virtual string transportOutputFlow() const
     54  {
     55    ostringstream sortie;
     56    cout << " BEND sortie transport non programmee " << endl;
     57    return sortie.str();
     58  }
     59
    5360virtual  string FileOutputFlow() const
    5461  {

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

    r50 r82  
    5151  virtual  string parmelaOutputFlow() const;
    5252
     53virtual string transportOutputFlow() const
     54  {
     55    ostringstream sortie;
     56    cout << " CELL sortie transport non programmee " << endl;
     57    return sortie.str();
     58  }
     59
     60
    5361  virtual string FileOutputFlow() const;
    5462

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

    r50 r82  
    1010{
    1111
    12   //  int nbParam_;
    13   //  string* parametersString_;
    1412
    1513 public:
    … …  
    2624  virtual  string parmelaOutputFlow() const;
    2725
     26virtual string transportOutputFlow() const
     27  {
     28    ostringstream sortie;
     29    cout << " DRIFT sortie transport non programmee " << endl;
     30    return sortie.str();
     31  }
     32
     33
    2834  virtual string FileOutputFlow() const;
    2935

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

    r59 r82  
    5353 virtual string parmelaOutputFlow() const;
    5454
     55virtual string transportOutputFlow() const
     56  {
     57    ostringstream sortie;
     58    cout << " CELL sortie transport non programmee " << endl;
     59    return sortie.str();
     60  }
     61
    5562 virtual string FileOutputFlow() const;
    5663

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

    r50 r82  
    1313{
    1414
    15   double B0_;   // en unites internes ( cm^(-1) )
     15  double B0_;   // en kilogauss
     16  double B0Def_;   // en kilogauss
     17
     18
     19
     20
     21  void setDefaultValues();
     22  void setDefaults();
     23
     24
    1625 
    1726 public :
    1827
    19  elementSoleno() :  abstractElement() {elementName_ = sole;}
     28  elementSoleno();
    2029
    21  elementSoleno(string lab) : abstractElement(lab)
    22     {
    23       elementName_ = sole;
    24       cout << " creation d'un SOLENOIDE l= " << ll << ", ap= " << ap << ", pas max " << stepmaxcm_ << endl;
     30 /* elementSoleno(string lab) : abstractElement(lab) */
     31 /*    { */
     32 /*      elementName_ = sole; */
     33 /*      cout << " creation d'un SOLENOIDE l= " << ll << ", ap= " << ap << ", pas max " << stepmaxcm_ << endl; */
    2534     
    26       B0_ = GAUSSToCMm1*BGauss;
    27       cout << " champ (Gauss) " << BGauss << ", (cm-1) " << B0_ << endl;
    28     }
     35 /*      B0_ = GAUSSToCMm1*BGauss; */
     36 /*      cout << " champ (Gauss) " << BGauss << ", (cm-1) " << B0_ << endl; */
     37 /*    } */
    2938
    3039  ~elementSoleno() {;}
    3140
    32 virtual void setParametersString(string* param)
    33 {
    34     ostringstream sortie;
    35     cout << " SOLENO setParametersString non programme " << endl;
    36     return sortie.str();
    37 }
     41 virtual void setParametersString(string* param);
    3842
    39  virtual string* getParametersString() const
    40  {
    41     ostringstream sortie;
    42     cout << " SOLENO getParametersString non programme " << endl;
    43     return sortie.str();
    44  }
     43 virtual string* getParametersString() const;
    4544
    46 virtual  string parmelaOutputFlow() const
    47   {
    48     ostringstream sortie;
    49     cout << " SOLENO sortie parmela non progerammee " << endl;
    50     return sortie.str();
    51   }
     45 virtual  string parmelaOutputFlow() const;
    5246
     47 virtual string transportOutputFlow() const;
    5348
    54 virtual  string FileOutputFlow() const
    55   {
    56     ostringstream sortie;
    57     cout << " SOLENO sortie fichier non progerammee " << endl;
    58     return sortie.str();
    59   }
     49 virtual  string FileOutputFlow() const;
    6050
    61 virtual void FileInput(ifstream& ifs)
    62 {
    63     cout << " SOLENO lecture fichier non programmee " << endl;
    64 }
     51 virtual void FileInput(ifstream& ifs);
    6552
    6653};

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

    r50 r82  
    99#include "elementInitialBeam.h"
    1010#include "elementCell.h"
     11#include "elementSoleno.h"
    1112
    1213
    … …  
    6667
    6768
     69inline abstractElement* createNewSoleno()
     70 {
     71   elements_.push_back(new elementSoleno());
     72   return elements_.back();
     73 }
     74
     75
     76
    6877
    6978inline abstractElement* getElementPointer(string label) const

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

    r58 r82  
    77typedef enum
    88  {
    9     initialBeam, drift, cell, bend, sole, solenoidalBmap
     9    initialBeam, drift, cell, bend, soleno
    1010  }    nomdElement;
    1111
Note: See TracChangeset for help on using the changeset viewer.