Changeset 1920 in Sophya

Timestamp:

Mar 6, 2002, 5:50:30 PM (24 years ago)

Author:

perderos

Message:

1) ajout de commande pour trace de champ de vecteur
2) modif pour compil sous peida (pawexecut.cc) OP 06/03/2002

Location:

trunk/SophyaPI/PIext

Files:

• contmodex.cc (modified) (2 diffs)
• flowmodex.cc (added)
• flowmodex.h (added)
• pawexecut.cc (modified) (7 diffs)
• pi2dvec.cc (added)
• pi2dvec.h (added)
• piacmd.cc (modified) (2 diffs)
• piacmd.h (modified) (2 diffs)
• pintuple.cc (modified) (1 diff)
• pistlist.cc (modified) (1 diff)

trunk/SophyaPI/PIext/contmodex.cc

@@ -24 +24 @@
   cout << " registration of contour commands "<<endl;
   string hgrp,kw,usage;
-  hgrp = "OlivierCmd";
+  
+  hgrp = "Obj. Display";
   
   kw = "contour";
@@ -31 +32 @@
   mpiac->RegisterCommand(kw, usage, this, hgrp);
   
+  hgrp = "Obj. Display";
   kw = "ntcont";
   usage = "Creates and displays a ContourDrawer (from a NTuple)";

trunk/SophyaPI/PIext/pawexecut.cc

@@ -82 +82 @@
 piac->RegisterCommand(kw,usage,this,hgrp);
 
+//#ifndef SANS_EVOLPLANCK
 kw = "v/integ";
-usage = "Integrate a TVector";
+usage = "Integrate a TVector / vector";
 usage += "\n v/integ namevec [norm]";
 usage += "\n norm<=0 means no normalisation (def norm=0)";
 usage += "\n  Related commands: h/integ h/deriv v/deriv";
 piac->RegisterCommand(kw,usage,this,hgrp);
+//#endif
 
 kw = "h/deriv";
@@ -95 +97 @@
 piac->RegisterCommand(kw,usage,this,hgrp);
 
+//#ifndef SANS_EVOLPLANCK
 kw = "v/deriv";
-usage = "Derivate a TVector";
+usage = "Derivate a TVector / vector";
 usage += "\n v/deriv namevec [deriv_option]";
 usage += "\n deriv_option -1 replace v[i] with v[i]-v[i-1]";
@@ -103 +106 @@
 usage += "\n  Related commands: h/integ h/deriv v/integ";
 piac->RegisterCommand(kw,usage,this,hgrp);
+//#endif
 
 kw = "h/rebin";
@@ -231 +235 @@
 } else if(kw == "h/integ") {
   h_integ(tokens); return(0);
+  //#ifndef SANS_EVOLPLANCK
 } else if(kw == "v/integ") {
   v_integ(tokens); return(0);
+  //#endif
 } else if(kw == "h/deriv") {
   h_deriv(tokens); return(0);
+  //#ifndef SANS_EVOLPLANCK
 } else if(kw == "v/deriv") {
   v_deriv(tokens); return(0);
+  //#endif
 } else if(kw == "h/rebin") {
   h_rebin(tokens); return(0);
@@ -586 +594 @@
 r_8 norm=-1.;
 if(tokens.size()>=2) norm = atof(tokens[1].c_str());
+#ifdef SANS_EVOLPLANCK
+Vector* v = dynamic_cast<Vector*>(mobj);
+#else
 TVector<r_8>* v = dynamic_cast<TVector<r_8>*>(mobj);
+#endif
+
 if(!v)
-  {cout<<"PAWExecutor::v_integ Error: "<<tokens[0]<<" not a TVector"<<endl;
-  return;}
+  {cout<<"PAWExecutor::v_integ Error: "<<tokens[0]<<" not a TVector/Vector"<<endl;
+  return;}
+
+#ifdef SANS_EVOLPLANCK
+uint_4 n = v->NElts();
+#else
 uint_4 n = v->Size();
+#endif
+
 if(n==0)
   {cout<<"PAWExecutor::v_integ Error: "<<tokens[0]<<" is an empty vector"<<endl;
@@ -636 +655 @@
 int_4 deriv_option = 0;
 if(tokens.size()>=2) deriv_option = atoi(tokens[1].c_str());
+
+#ifdef SANS_EVOLPLANCK
+Vector* v = dynamic_cast<Vector*>(mobj);
+#else
 TVector<r_8>* v = dynamic_cast<TVector<r_8>*>(mobj);
+#endif
+
 if(!v)
-  {cout<<"PAWExecutor::v_deriv Error: "<<tokens[0]<<" not a TVector"<<endl;
-  return;}
+  {cout<<"PAWExecutor::v_deriv Error: "<<tokens[0]<<" not a TVector/Vector"<<endl;
+  return;}
+
+
+#ifdef SANS_EVOLPLANCK
+uint_4 n = v->NElts();
+#else
 uint_4 n = v->Size();
+#endif
+
 if(n==0)
   {cout<<"PAWExecutor::v_deriv Error: "<<tokens[0]<<" is an empty vector"<<endl;
   return;}
 if(n<=1) return;
+
+#ifdef SANS_EVOLPLANCK
+Vector vsave(*v);
+#else
 TVector<r_8> vsave(*v,false);
+#endif
+
 if(deriv_option<0) {
   for(uint_4 i=1;i<n;i++) (*v)(i) = vsave(i)-vsave(i-1);
@@ -658 +696 @@
 }
 }
+
 
 /* methode */

trunk/SophyaPI/PIext/piacmd.cc

@@ -18 +18 @@
 #include "cxxexecwin.h"
 #include "contmodex.h" 
+#include "flowmodex.h"
 
 #include PISTDWDG_H 
@@ -337 +338 @@
 ContModExecutor *cntxx = new ContModExecutor(this, app);//_OP_
 cntexec = cntxx; //_OP_
+FlowModExecutor *flwxx = new FlowModExecutor(this, app);//_OP_
+flwexec = flwxx; //_OP_
 
 cxxoptwin = new  CxxOptionWind(app, cxxe);

trunk/SophyaPI/PIext/piacmd.h

@@ -18 +18 @@
 #include "dlftypes.h"
 #include "pdlmgr.h"
+#include "ctimer.h"
 
 // Classe definissant l'interface pour un executeur de commande
@@ -117 +118 @@
 
   CmdExecutor *cntexec; // contour executor _OP_
+  CmdExecutor *flwexec; // flow chart executor _OP_
  
 // Pour enregistrer la liste de commandes et leurs executeurs et le help

trunk/SophyaPI/PIext/pintuple.cc

@@ -160 +160 @@
 if (wK >= 0)  mrk = (mmrk != PI_NotDefMarker) ? mmrk : PI_CircleMarker;
 else   mrk = (mmrk != PI_NotDefMarker) ? mmrk : PI_DotMarker;
-msz = GetGraphicAtt().GetMarkerSz();;
+ msz = GetGraphicAtt().GetMarkerSz(); 
 if (msz < 1) msz = 1;
 g->SelMarker(msz, mrk);

trunk/SophyaPI/PIext/pistlist.cc

@@ -113 +113 @@
 double ymax2 = uymax;
 
-int msz = mMSz;
+// int msz = mMSz; //OP
+int  msz = GetGraphicAtt().GetMarkerSz(); 
+
 if (msz < 1) msz = 1;
-PIMarker mrk = (mMrk != PI_NotDefMarker) ? mMrk : PI_FCircleMarker;
+//PIMarker mrk = (mMrk != PI_NotDefMarker) ? mMrk : PI_FCircleMarker; //OP
+PIMarker mmrk = GetGraphicAtt().GetMarker();
+PIMarker mrk = (mmrk != PI_NotDefMarker) ? mmrk : PI_FCircleMarker;
+
 // g->SelFont();
 nok = 0;  nl2 = mNLev*2-1;