Changeset 434 in PSPA for Interface_Web/trunk
- Timestamp:
- Nov 22, 2013, 9:57:54 AM (11 years ago)
- Location:
- Interface_Web/trunk/pspaWT/sources
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/sources/controler/src/particleBeam.cc
r418 r434 375 375 void particleBeam::particlesPhaseSpaceComponent(vector<double>& coord, unsigned index) 376 376 { 377 377 378 if ( !particleRepresentationOk_ ) return; 378 379 379 380 coord.clear(); 380 381 coord.resize(relativePartic_.size(), 0.0 ); 381 cout << " particleBeam::particlesPhaseSpaceComponent index = " << index << endl;382 // cout << " particleBeam::particlesPhaseSpaceComponent index = " << index << endl; 382 383 383 384 if ( index <= 2 ) { … … 392 393 393 394 if ( index > 2 && index < 5 ) { 394 cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses " << endl;395 // cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses " << endl; 395 396 for (unsigned i = 0; i < relativePartic_.size(); ++i) { 396 397 double begamz = relativePartic_.at(i).getBetaGamma().getComponent(2); … … 401 402 } 402 403 } 403 cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses TERMINE " << endl;404 // cout << " particleBeam::particlesPhaseSpaceComponent traitement vitesses TERMINE " << endl; 404 405 return; 405 406 } … … 727 728 double gamma = relativePartic_.at(particleIndex).getGamma(); 728 729 // TRIDVECTOR pos = relativePartic_.at(particleIndex).getPosition(); 730 // cout << " ------------------ particleBeam::coordonneesDeployees ----- " << endl; 731 // cout << " particleBeam::coordonneesDeployees " << relativePartic_.at(particleIndex).FileOutputFlow() << endl; 732 // cout << " par reference x= " << relativePartic_.at(particleIndex).getReferenceToPosition().getComponent(0); 733 // cout << " ----------------------------------------------------- " << endl; 734 735 736 729 737 double xx = relativePartic_.at(particleIndex).getReferenceToPosition().getComponent(0); 730 738 double yy = relativePartic_.at(particleIndex).getReferenceToPosition().getComponent(1); … … 733 741 // TRIDVECTOR begam= goodPartic_.at(particleIndex).getBetaGamma(); 734 742 double begamz = relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(2); 735 double dz = begamz * cdt / gamma; 736 double xp = relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(0)/begamz; 737 double yp = relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(1)/begamz; 738 xx += xp * dz; 739 yy += yp * dz; 740 return TRIDVECTOR(xx, yy, dz); 743 double fac = cdt / gamma; 744 // double dz = begamz * fac; 745 xx += relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(0) * fac; 746 yy += relativePartic_.at(particleIndex).getReferenceToBetaGamma().getComponent(1) * fac; 747 return TRIDVECTOR(xx, yy, begamz * fac); 741 748 } -
Interface_Web/trunk/pspaWT/sources/controler/src/softwareGenerator.cc
r418 r434 15 15 { 16 16 nameOfSoftware_ = nomDeLogiciel("generator"); 17 registerElement(nomdElements:: beam,TBoolOk);17 registerElement(nomdElements::RFgun,TBoolOk); 18 18 } 19 19 … … 227 227 if ( faisceau.at(k).flag == -1 ) { 228 228 particles.push_back(bareParticle(pos,betagamma)); 229 // cout << " generator enregistre " << particles.back().FileOutputFlow() << endl; 229 230 } else { 230 231 passiveParticles.push_back(bareParticle(pos,betagamma)); -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc
r431 r434 612 612 seriesType = PointSeries; 613 613 titre = " phase space "; 614 cout << " PspaApplication::faireDessinPhaseSpace APPEL " << endl;615 614 beam->particlesPhaseSpaceData(xcor,ycor,legende,namex,namey); 616 cout << " PspaApplication::faireDessinPhaseSpace RETOUR " << endl; 615 // for ( int kk=0; kk < xcor.size(); kk++) 616 // { 617 // cout << " dess. phas. x= " << xcor.at(kk) << " x'= " << ycor.at(kk) << endl; 618 // } 617 619 } else { 618 620 GWt_dialog warningBeamState(" graphical analysis", "the beam state does not allow providing a drawing with macroparticles !", GWt_dialog::Error, false,true); … … 874 876 model->setData(i, 0, xcor.at(i)); 875 877 model->setData(i, 1, ycor.at(i)); 876 // cout << " PspaApplication::chartPlot2vec el= " << i+1 << " x= " << xcor.at(i) << " y= " << ycor.at(i) << endl;877 } 878 878 // cout << " PspaApplication::chartPlot2vec el= " << i+1 << " x= " << xcor.at(i) << " y= " << ycor.at(i) << endl; 879 } 880 // cout << " PspaApplication::chartPlot2vec FLAG 0 " << endl; 879 881 WCartesianChart *chart = new WCartesianChart(toto); 880 882 if (!makeIcon) chart->setTitle(title); … … 896 898 chart->axis(YAxis).setLocation(value); 897 899 900 // cout << " PspaApplication::chartPlot2vec FLAG 1 " << endl; 901 898 902 WDataSeries s(1,seriesType); 899 903 s.setPen(WColor("red")); … … 911 915 chart->axis(Y1Axis).setGridLinesEnabled(true); 912 916 } 913 917 // cout << " PspaApplication::chartPlot2vec FLAG 2 " << endl; 918 914 919 chart->resize(width,height); // WPaintedWidget must be given explicit size 915 920 chart->setMargin(10, Top | Bottom); // ? … … 927 932 chart->axis(YAxis).setLabelFont(yAxisFont); 928 933 } 934 // cout << " PspaApplication::chartPlot2vec FLAG 3 " << endl; 929 935 930 936 #ifdef HAS_IMAGEMAGIC 937 938 // cout << " PspaApplication::chartPlot2vec FLAG MAGIC " << endl; 931 939 932 940 // no background … … 938 946 939 947 std::string name; 940 /*948 /* 941 949 Wt::WRasterImage pngImage("png", 1000, 1000); 942 950 Wt::WPainter p(&pngImage); … … 945 953 std::ofstream f(name.c_str(), std::ios::out |std::ios::trunc | std::ios::binary); 946 954 pngImage.write(f); 947 */ 948 955 */ 949 956 950 957 Wt::WPdfImage pdfImage("1000", "600"); 951 {958 { 952 959 Wt::WPainter p1(&pdfImage); 953 960 chart->paint(p1); 954 }961 } 955 962 956 963 name = workingDir_ + "/chart-"+sessionId ()+".pdf"; … … 961 968 962 969 #endif 970 // cout << " PspaApplication::chartPlot2vec FLAG FIN" << endl; 963 971 964 972 }
Note: See TracChangeset
for help on using the changeset viewer.