Changeset 298 in PSPA


Ignore:
Timestamp:
Jan 29, 2013, 9:06:51 PM (11 years ago)
Author:
lemeur
Message:

interface software

Location:
Interface_Web/trunk/pspaWT/sources/controler
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r295 r298  
    3232
    3333
    34   virtual bool  execute(vector<particleBeam>& beamAfterElement, unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul) = 0;
     34  virtual bool  execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul) = 0;
    3535
    3636 virtual bool buildBeamAfterElements(unsigned int numeroDeb,unsigned int numeroFin, vector<particleBeam>& beams, string workingDir) = 0;

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

    r295 r298  
    2121  virtual bool createInputFile(particleBeam* beamBefore, unsigned int numeroDeb, unsigned int numeroFin, string workingDir);
    2222
    23   virtual bool  execute(vector<particleBeam>& beamAfterElement, unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul);
     23  virtual bool  execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul);
    2424
    2525

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

    r295 r298  
    1919  virtual bool createInputFile(particleBeam* beamBefore,unsigned int numeroDeb, unsigned int numeroFin, string workingDir);
    2020
    21   virtual bool  execute(vector<particleBeam>& beamAfterElement, unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul);
     21  virtual bool  execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul);
    2222
    2323

  • Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

    r297 r298  
    141141      success = softw->createInputFile(currentBeam_, debut, fin, workingDir);
    142142      if ( !success ) {
    143         resultatPartiel += " error creating input file ";
     143        resultatPartiel += " error creating input file \n";
    144144      } else {
    145         success = softw->execute(diagnosticBeam_, debut,fin,workingDir,resultatPartiel);
     145        success = softw->execute(debut,fin,workingDir,resultatPartiel);
     146        if ( success ) {
     147          success = softw->buildBeamAfterElements(debut, fin, diagnosticBeam_, workingDir);
     148          if ( !success ) {
     149            resultatPartiel += " readingt results  failed \n";
     150          }
     151        }
    146152      }
    147153      delete softw;

  • Interface_Web/trunk/pspaWT/sources/controler/src/softwareParmela.cc

    r295 r298  
    6969
    7070
    71 bool  softwareParmela::execute(vector<particleBeam>& beamAfterElement, unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul)
     71bool  softwareParmela::execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul)
    7272{
    7373  ostringstream sortie;
    … …  
    105105        ExecuteStatus = false;
    106106      }
    107     else
    108       {
    109         ExecuteStatus = buildBeamAfterElements(numeroDeb,numeroFin, beamAfterElement, workingDir);
    110         if ( !ExecuteStatus ) {
    111                   sortie << " reading parmdesz  failed " << endl;
    112         }
    113 
    114       }
     107    // else
     108    //   {
     109    // ExecuteStatus = buildBeamAfterElements(numeroDeb,numeroFin, beamAfterElement, workingDir);
     110    // if ( !ExecuteStatus ) {
     111    //            sortie << " reading parmdesz  failed " << endl;
     112    // }
     113
     114    //   }
    115115  }
    116116
    … …  
    141141                }
    142142              }
    143             beams.back().setWithParticles(centroid, refPart,particles);
     143            else {
     144              beams.back().setWithParticles(centroid, refPart,particles);
     145            }
    144146          }
    145147        return result;

  • Interface_Web/trunk/pspaWT/sources/controler/src/softwareTransport.cc

    r297 r298  
    104104
    105105
    106 bool softwareTransport::execute(vector<particleBeam>& beamAfterElement, unsigned int numeroDeb, unsigned int numeroFin, string workingDir, string& resul)
     106bool softwareTransport::execute( unsigned int numeroDeb, unsigned int numeroFin, string workingDir, string& resul)
    107107{
    108108  ostringstream sortie;
    … …  
    145145      outfile << resultOfRun << endl;
    146146      outfile.close();
    147       ExecuteStatus = buildBeamAfterElements(numeroDeb,numeroFin, beamAfterElement, workingDir);
    148       if ( !ExecuteStatus ) {
    149         sortie << " reading transport results  failed " << endl;
    150       }
     147      // ExecuteStatus = buildBeamAfterElements(numeroDeb,numeroFin, beamAfterElement, workingDir);
     148      // if ( !ExecuteStatus ) {
     149      //        sortie << " reading transport results  failed " << endl;
     150      //      }
    151151    }
    152152  }
Note: See TracChangeset for help on using the changeset viewer.