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


Ignore:
Timestamp:
Nov 19, 2012, 9:18:48 AM (12 years ago)
Author:
lemeur
Message:

execution complete de transport

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

Legend:

Unmodified
Added
Removed

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

    r83 r84  
    88#include "abstractElement.h"
    99
    10 #include <Wt/WContainerWidget>
     10//#include <Wt/WContainerWidget>
    1111
    1212#include <iostream>
    … …  
    1919class GWt_cell : public GWt_abstractElement
    2020{
    21     /* PspaApplication* pspa_; */
    22     /* abstractElement* cell_; */
    23     /* WDialog* dialog_; */
    24     /* WPushButton* dropped_; */
    2521
    2622  WLineEdit* lenghtElemEdit_; // cm
    … …  
    4339
    4440
    45   //WPushButton* getButton();
    46 
    47   //void openParametersForm();
    48 
    4941virtual void dialogDone();
    5042};

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

    r82 r84  
    5757  abstractElement* addInitialBeam();
    5858  abstractElement* addSoleno();
     59  abstractElement* addBend();
    5960  void initializeExecution();
    6061  string executeTransport( unsigned int indexDeb, unsigned int indexFin);

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

    r82 r84  
    66#include "abstractElement.h"
    77#include "mathematicalTools.h"
    8 #include "MathematicalConstants.h"
    9 #include "PhysicalConstants.h"
     8//#include "PhysicalConstants.h"
    109 
    1110
    … …  
    1312
    1413// aimant dipolaire,  DANS LE PLAN XZ (le champ est dans la direction Y)
     14
     15
    1516class elementBend : public abstractElement
    1617{
    1718
    18   double gammaBetaRef_; // peut-etre pas necessaire
    19   double alphaRadians_;
    20   double B0_;   // en unites internes ( cm^(-1) )
    21   double rho_;  // cm
     19  double angleDeg_; // deg.
     20  double radius_; // m
     21  double beta1_; // deg.
     22  double beta2_; // deg.
     23
     24  double angleDegDef_; // deg.
     25  double radiusDef_; // m
     26  double beta1Def_; // deg.
     27  double beta2Def_; // deg.
     28
     29
     30
     31  void setDefaultValues();
     32  void setDefaults();
     33
     34
    2235 public:
    2336
    24  elementBend()  : abstractElement() {elementName_ = bend;}
    25 
    26  elementBend(string lab) ;
    27 
     37  elementBend();
    2838
    2939  ~elementBend() {;}
    3040
     41  double getLenghtOfElement() const;
    3142
    32 virtual void setParametersString(string* param)
    33 {
    34     ostringstream sortie;
    35     cout << " BEND :setParametersString non programme " << endl;
    36     return sortie.str();
    37 }
    3843
    39 virtual string* getParametersString() const
    40 {
    41     ostringstream sortie;
    42     cout << " BEND :getParametersString non programme " << endl;
    43     return sortie.str();
    44 }
     44  virtual void setParametersString(string* param);
     45
     46  virtual string* getParametersString() const;
    4547
    4648virtual  string parmelaOutputFlow() const
    … …  
    5153  }
    5254
    53 virtual string transportOutputFlow() const
    54   {
    55     ostringstream sortie;
    56     cout << " BEND sortie transport non programmee " << endl;
    57     return sortie.str();
    58   }
     55 virtual string transportOutputFlow() const;
    5956
    60 virtual  string FileOutputFlow() const
    61   {
    62     ostringstream sortie;
    63     cout << " BEND sortie fichier non programmee " << endl;
    64     return sortie.str();
    65   }
     57 virtual  string FileOutputFlow() const;
    6658
     59 virtual void FileInput(ifstream& ifs);
    6760
    68  virtual void FileInput(ifstream& ifs)
    69  {
    70     cout << " BEND lecture fichier non programmee " << endl;
    71  }
    7261};
    7362

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

    r82 r84  
    2424  virtual  string parmelaOutputFlow() const;
    2525
    26 virtual string transportOutputFlow() const
    27   {
    28     ostringstream sortie;
    29     cout << " DRIFT sortie transport non programmee " << endl;
    30     return sortie.str();
    31   }
     26  virtual string transportOutputFlow() const;
    3227
    3328

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

    r82 r84  
    66#include "abstractElement.h"
    77
    8 #include "mathematicalTools.h"
    9 #include "PhysicalConstants.h"
     8//#include "mathematicalTools.h"
     9//#include "PhysicalConstants.h"
    1010 
    1111using namespace std;
    … …  
    2828  elementSoleno();
    2929
    30  /* elementSoleno(string lab) : abstractElement(lab) */
    31  /*    { */
    32  /*      elementName_ = sole; */
    33  /*      cout << " creation d'un SOLENOIDE l= " << ll << ", ap= " << ap << ", pas max " << stepmaxcm_ << endl; */
    34      
    35  /*      B0_ = GAUSSToCMm1*BGauss; */
    36  /*      cout << " champ (Gauss) " << BGauss << ", (cm-1) " << B0_ << endl; */
    37  /*    } */
    38 
    3930  ~elementSoleno() {;}
    4031

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

    r82 r84  
    1010#include "elementCell.h"
    1111#include "elementSoleno.h"
     12#include "elementBend.h"
    1213
    1314
    … …  
    7374 }
    7475
     76inline abstractElement* createNewBend()
     77 {
     78   elements_.push_back(new elementBend());
     79   return elements_.back();
     80 }
     81
    7582
    7683

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

    r59 r84  
    33#include <iostream>
    44#include <sstream>
     5#include <stdio.h>
    56
    67#include<cmath>
    … …  
    7273  void setFromParmela(double referencefrequency);
    7374
     75  void setFromTransport(ifstream& inp, unsigned nblignes);
    7476
    7577  inline void clear()
Note: See TracChangeset for help on using the changeset viewer.