Changeset 344 in Sophya for trunk/SophyaPI/PIext/servnobjm.cc

Timestamp:

Aug 2, 1999, 6:52:49 PM (26 years ago)

Author:

ercodmgr

Message:

1/ Extension de fonctionalites de gestion de repertoires (Lock, ...)
2/ Plus de NTupIntf_Adapter quand les objets heritent de NTupleInterface
3/ Support pour affichage info texte, ds PINtuple et PIStarList

File:

• trunk/SophyaPI/PIext/servnobjm.cc (modified) (14 diffs)

trunk/SophyaPI/PIext/servnobjm.cc

@@ -200 +200 @@
 
 if (vpy) {
-  string titre = (nom.length() < 1) ? "Function f(x)" : nom;
-  P1DArrayAdapter* vya = new POVectorAdapter(vpy, true);
+  string titre;
+  if (nom.length() < 1) {
+     titre = "Function f(x)";
+     nom = "/tmp/func";
+    }
+  else titre = nom;
+  
+  P1DArrayAdapter* vya = new POVectorAdapter(vpy, false);
   vya->DefineXCoordinate(xmin, (xmax-xmin)/np);
   PIYfXDrawer* dr = new   PIYfXDrawer(vya, NULL, true) ; 
@@ -256 +262 @@
 
 if (mtx) {
-  string titre = (nom.length() < 1) ? "Function f(x,y)" : nom;  
+  string titre;
+  if (nom.length() < 1) {
+     titre = "Function f(x,y)";
+     nom = "/tmp/func2d";
+    }
+  else titre = nom;
   bool fgsr = true;
   int opt = DecodeDispOption(dopt, fgsr);
-  P2DArrayAdapter* arr = new POMatrixAdapter(mtx, true);
+  P2DArrayAdapter* arr = new POMatrixAdapter(mtx, false);
   arr->DefineXYCoordinates(xmin, ymin, dx, dy);
   PISurfaceDrawer* sdr = new PISurfaceDrawer(arr, true, true, true);
@@ -636 +647 @@
 /* --Methode-- */
 void Services2NObjMgr::FillNTFrCFile(string & nom, string const & fname, 
-                                     string const & funcname, string & nomnt)
+                                     string const & funcname, string & nomnt,
+                                     int nl1, int nl2)
 {
 if (!mImgapp)  return; 
@@ -646 +658 @@
   return;
   }
-NTupleInterface* objnt = obja->GetNTupleInterface();
+bool adel = true;
+NTupleInterface* objnt = obja->GetNTupleInterface(adel);
 if (objnt == NULL)  {
   cout << "Services2NObjMgr::FillNTFrCFile( " << nom << "...) No NTupleInterface !" <<endl;
@@ -655 +668 @@
 if (!f) { 
   cerr << "Services2NObjMgr::FillNTFrCFile Error Creation  NTLoopExprFunc" <<  endl; 
+  if (adel) delete objnt;   // Delete de l'objet NTupleInterface si necessaire
   return;
   }
@@ -691 +705 @@
 TRY  {
   double* xn;
-  int kmax = objnt->NbLines();
-  for(k=0; k<kmax; k++)    {
+  if (nl1 < 0) nl1 = 0;
+  if (nl2 < 0) nl2 = objnt->NbLines();
+  if (nl2 > objnt->NbLines()) nl2 = objnt->NbLines();
+  int kmax = nl2;
+  for(k=nl1; k<kmax; k++)    {
     xn = objnt->GetLineD(k);
     if (f(xn, xnt, xnt+1, xnt+2, xnt+3, k, kmax) != 0) {
@@ -709 +726 @@
   cerr << "Services2NObjMgr::FillNTFrCFile()  Exception :" << merr << es;
   } ENDTRY;
- 
+
+if (adel) delete objnt;   // Delete de l'objet NTupleInterface si necessaire
 CloseDLL();
 
@@ -729 +747 @@
   return;
   }
-NTupleInterface* objnt = obja->GetNTupleInterface();
+bool adel = true;
+NTupleInterface* objnt = obja->GetNTupleInterface(adel);
 if (objnt == NULL)  {
   cout << "Services2NObjMgr::PrepareNTExpressionCFile( " << nom 
@@ -740 +759 @@
 if ((fip = fopen(fname.c_str(), "w")) == NULL)   { 
   cout << "Services2NObjMgr::PrepareNTExpressionCFile()_Error: fopen " << fname << endl; 
+  if (adel) delete objnt;   // Delete de l'objet NTupleInterface si necessaire
   return; 
   }
+
 // constitution du fichier des decalarations des variables de l'interface NTuple
 fputs("#include <stdlib.h> \n", fip);
 fputs("#include <stdio.h> \n", fip);
 fputs("#include <math.h> \n\n", fip);
+
+fputs("/* ------ Some random number generators --------- */ \n", fip);
+fputs("#define frand01() ( (float) drand48() ) \n", fip);
+fputs("#define drand01() drand48()  \n", fip);
+fputs("#define rand01()  drand48()  \n", fip);
+fputs("#define frandpm1() ( 2. * frand01() - 1.) \n", fip);
+fputs("#define drandpm1() ( 2. * drand01() - 1.) \n", fip);
+fputs("#define randpm1() ( 2. * drand01() - 1.) \n", fip);
+fputs("double NorRand(void) \n", fip);
+fputs(" { \n double x,A,B; \n LAB10: \n A = drand01(); \n", fip);
+fputs(" if ( A == 0. ) goto LAB10; \n B = drand01(); \n", fip);
+fputs(" x = sqrt(-2.*log(A))*cos(M_2PI*B); \n", fip);
+fputs(" return(x); \n } \n", fip);
+fputs("#define GauRand() NorRand() \n", fip);
+fputs("#define gaurand() NorRand() \n\n", fip);
+
 fputs("/* NTupleInterface Variable declaration - Generated by piapp  \n", fip);
 fputs("      -- Services2NObjMgr::PrepareNTExpressionCFile()  --     */ \n\n", fip);
@@ -759 +796 @@
 
 fclose(fip);
+
+if (adel) delete objnt;   // Delete de l'objet NTupleInterface si necessaire
 return;
 }
@@ -1304 +1343 @@
 {
 if (obja == NULL) return;
-NTupleInterface* objnt = obja->GetNTupleInterface();
+bool adel = true;
+NTupleInterface* objnt = obja->GetNTupleInterface(adel);
 if (objnt == NULL)  return;
 string  vardec = objnt->VarList_C("_zz6qi_");
@@ -1311 +1351 @@
 if (!f) { 
   cerr << "Services2NObjMgr::::ComputeExpressions() Error Creation PlotExprFunc " <<  endl; 
+  if (adel) delete objnt;  // Delete de l'objet NTupleInterface si necessaire
   return;
   }
@@ -1344 +1385 @@
  
 
+if (adel) delete objnt;  // Delete de l'objet NTupleInterface si necessaire
 // Fermeture du fichier .so 
 CloseDLL();
@@ -1372 +1414 @@
 fputs("#include <stdlib.h> \n", fip);
 fputs("#include <math.h> \n", fip);
+
+fputs("/* ------ Some random number generators --------- */ \n", fip);
+fputs("#define frand01() ( (float) drand48() ) \n", fip);
+fputs("#define drand01() drand48()  \n", fip);
+fputs("#define rand01()  drand48()  \n", fip);
+fputs("#define frandpm1() ( 2. * frand01() - 1.) \n", fip);
+fputs("#define drandpm1() ( 2. * drand01() - 1.) \n", fip);
+fputs("#define randpm1() ( 2. * drand01() - 1.) \n", fip);
+fputs("double NorRand(void) \n", fip);
+fputs(" { \n double x,A,B; \n LAB10: \n A = drand01(); \n", fip);
+fputs(" if ( A == 0. ) goto LAB10; \n B = drand01(); \n", fip);
+fputs(" x = sqrt(-2.*log(A))*cos(M_2PI*B); \n", fip);
+fputs(" return(x); \n } \n", fip);
+fputs("#define GauRand() NorRand() \n", fip);
+fputs("#define gaurand() NorRand() \n\n", fip);
+
 fputs("int expf_pia_dl_func(double* _zz6qi_, double* _rx_6q_, double* _ry_6q_, double* _rz_6q_, double* _rt_6q_) \n{\n", fip);
 fprintf(fip,"%s \n", vardec.c_str());