Ignore:
Timestamp:
Nov 15, 2013, 3:30:50 PM (11 years ago)
Author:
touze
Message:

systeme periodique (mailles) + multipoles + madx

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r424 r431  
    1414#include "nomDeLogiciel.h"
    1515
     16#include "sectorParameters.h" //xx
     17
    1618class PspaApplication;
    1719
    … …  
    2123 public:
    2224 
     25  dataManager() {;}
    2326  dataManager(PspaApplication*);
    2427  virtual ~dataManager();
    … …  
    2730  inline globalParameters* getGlobalParameters()  {return &globParam_;}
    2831  inline particleBeam* getCurrentBeam() {return currentBeam_;}
     32
     33  // xx
     34  inline sectorParameters* getSectorParameters() {return &sectorParam_;}
    2935   
    3036  particleBeam* getDiagnosticBeam(unsigned index);
    … …  
    5056 
    5157  void initializeExecution();
    52 //  trivaluedBool checkExecute(string& diagnostic);
    53 //  trivaluedBool checkElementsForExec(nomDeLogiciel logiciel, unsigned indexDeb, unsigned indexFin, string& diagnostic);
     58
    5459  bool executeAll();
    5560 
    … …  
    8186    return &diagnosticBeam_.back();
    8287  }
    83  
    84   /** return a specific jobList index
    85       return NULL if the index does not exist
    86   */
    87  
    88   /* inline sectionToExecute* getJobListAt(int a) { */
    89     /*     if (a < 0) return NULL; */
    90     /*     if (a >= getJobListSize()) return NULL; */
    91     /*     return jobList_[a]; */
    92     /* } */
    93 
    94  
    95  
    96     /* inline const abstractSoftware* getSoftwareOfSection( int index) const { */
    97     /*     if (index < 0) return NULL; */
    98     /*     if (index >= getJobListSize()) return NULL; */
    99     /*  return jobList_[index]->getSoftware(); */
    100     /* } */
    10188   
    102     /** Clear a specific jobList */
     89  /** Clear a specific jobList */
    10390  void clearSectionToExecute(int a);
    10491   
    … …  
    10693
    10794  globalParameters globParam_;
     95  sectorParameters sectorParam_; //xx
    10896  particleBeam* currentBeam_;
    10997  PspaApplication* pspa_;
    … …  
    113101  vector<particleBeam> diagnosticBeam_;
    114102  vector<unsigned> indexElementToIndexDiag_;
    115   // numeroElementToIndexDiag_[k] contient, pour l'element d'index k, l'indice ind tel que diagnosticBeam_[ind]
    116   // soit le faisceau resultat, en l'etat qu'il doit avoir apres l'element k
    117  
    118103  vector<sectionToExecute*> jobList_;
    119104 
Note: See TracChangeset for help on using the changeset viewer.