Changeset 719 in Sophya for trunk

Timestamp:

Feb 6, 2000, 4:06:55 PM (26 years ago)

Author:

ercodmgr

Message:

Introoduction adaptateur XNTuple pour SOPHYA, Reza 7 Fev 2000

Location:

trunk/SophyaPI/PIext

Files:

• nomhistadapter.cc (modified) (3 diffs)
• nomhistadapter.h (modified) (3 diffs)
• nomtmatvecadapter.cc (modified) (4 diffs)
• piinit.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/nomhistadapter.cc

@@ -318 +318 @@
 }
 
-#ifdef SANS_EVOLPLANCK
 //-------------------------------------------------------------------------
 // Class Adaptateur d'objet (Pour NamedObjMgr) d'objet XNTuple
@@ -352 +351 @@
 mNt->Write(pos,0,tag);
 #else
-string s = typeid(*mObj).name();
-cout << "NOMAdapter_XNTuple::SavePPF() - Error : Not supported for " << s << endl;
+ObjFileIO<XNTuple> fio(mNt);
+fio.Write(pos, nom);
 #endif
 }
@@ -372 +371 @@
 }
 
-#endif  // SANS_EVOLPLANCK
-
+

trunk/SophyaPI/PIext/nomhistadapter.h

@@ -13 +13 @@
 #include "ntuple.h"
 
-#ifdef SANS_EVOLPLANCK
 #include "xntuple.h"
-#endif
 
 //-------------------------------------------------------------------------
@@ -118 +116 @@
 };
 
-#ifdef SANS_EVOLPLANCK
 //-------------------------------------------------------------------------
 // Class Adaptateur d'objet (Pour NamedObjMgr) d'objet XNTuple 
@@ -141 +138 @@
 };
 
-#endif  // SANS_EVOLPLANCK
 
 

trunk/SophyaPI/PIext/nomtmatvecadapter.cc

@@ -211 +211 @@
 #pragma define_template NOMAdapter_TMatrix<r_4>
 #pragma define_template NOMAdapter_TMatrix<r_8>
-#pragma define_template NOMAdapter_TMatrix< complex<float> >
-#pragma define_template NOMAdapter_TMatrix< complex<double> >
+#pragma define_template NOMAdapter_TMatrix< complex<r_4> >
+#pragma define_template NOMAdapter_TMatrix< complex<r_8> >
 //#pragma define_template NTupInt_TMatrix<uint_2>
 //#pragma define_template NTupInt_TMatrix<int_2>
@@ -218 +218 @@
 #pragma define_template NTupInt_TMatrix<r_4>
 #pragma define_template NTupInt_TMatrix<r_8>
-#pragma define_template NTupInt_TMatrix< complex<float> >
-#pragma define_template NTupInt_TMatrix< complex<double> >
+#pragma define_template NTupInt_TMatrix< complex<r_4> >
+#pragma define_template NTupInt_TMatrix< complex<r_8> >
 #endif
 
@@ -228 +228 @@
 template class NOMAdapter_TMatrix<r_4>;
 template class NOMAdapter_TMatrix<r_8>;
-template class NOMAdapter_TMatrix< complex<float> >;
-template class NOMAdapter_TMatrix< complex<double> >;
+template class NOMAdapter_TMatrix< complex<r_4> >;
+template class NOMAdapter_TMatrix< complex<r_8> >;
 // template class NTupInt_TMatrix<uint_2>;
 // template class NTupInt_TMatrix<int_2>;
@@ -235 +235 @@
 template class NTupInt_TMatrix<r_4>;
 template class NTupInt_TMatrix<r_8>;
-template class NTupInt_TMatrix< complex<float> >;
-template class NTupInt_TMatrix< complex<double> >;
+template class NTupInt_TMatrix< complex<r_4> >;
+template class NTupInt_TMatrix< complex<r_8> >;
 #endif

trunk/SophyaPI/PIext/piinit.cc

@@ -39 +39 @@
   serv->RegisterClass(new Histo2D, new NOMAdapter_Histo2D );
   serv->RegisterClass(new NTuple, new NOMAdapter_NTuple );
-#ifdef SANS_EVOLPLANCK
+
   serv->RegisterClass(new XNTuple, new NOMAdapter_XNTuple );
   char* varenv=NULL;
   if ( (varenv=getenv("PEIDA_TMP")) == NULL )   varenv=getenv("TMPDIR") ;
   if (varenv)  XNTuple::SetSwapPath(varenv);
-#endif
 
   serv->RegisterClass(new GeneralFitData, new NOMAdapter_GeneralFitData );
@@ -58 +57 @@
   serv->RegisterClass(new TVector<r_8>, new NOMAdapter_TMatrix<r_8> );
   serv->RegisterClass(new TMatrix<r_8>, new NOMAdapter_TMatrix<r_8> );
-  serv->RegisterClass(new TVector<complex<float> >, new NOMAdapter_TMatrix<complex<float> > );
-  serv->RegisterClass(new TMatrix<complex<float> >, new NOMAdapter_TMatrix<complex<float> > );
-  serv->RegisterClass(new TVector<complex<double> >, new NOMAdapter_TMatrix<complex<double> > );
-  serv->RegisterClass(new TMatrix<complex<double> >, new NOMAdapter_TMatrix<complex<double> > );
+  serv->RegisterClass(new TVector<complex<r_4> >, new NOMAdapter_TMatrix<complex<r_4> > );
+  serv->RegisterClass(new TMatrix<complex<r_4> >, new NOMAdapter_TMatrix<complex<r_4> > );
+  serv->RegisterClass(new TVector<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
+  serv->RegisterClass(new TMatrix<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
 #endif