Changeset 2705 in Sophya for trunk/SophyaProg

Timestamp:

Apr 28, 2005, 11:36:17 AM (20 years ago)

Author:

ansari

Message:

modif/adaptation tobjio.cc suite changement interface de ObjFile<T> - Reza 28/4/2005

Location:

trunk/SophyaProg/Tests

Files:

• makepi (modified) (1 diff)
• tobjio.cc (modified) (6 diffs)

trunk/SophyaProg/Tests/makepi

@@ -17 +17 @@
 
 LIBF =  $(SLB)libsophya.so 
-LIBS = -L$(SLB) -lPI -lextsophya -lsophya -lpthread -lXm -lXt -lX11 -lm 
+LIBS = -L$(SLB) -lPI -lextsophya -lsophya -lpthread -L/usr/X11R6/lib -lXm -lXt -lX11 -lm 
 ifeq ($(MACHEROS),OSF1)
 LIBS := $(LIBS) -lfor
 endif
 ifeq ($(MACHEROS),Linux)
-LIBS := $(LIBS) -ldl -lf2c
+LIBS := $(LIBS) -ldl 
 endif
 

trunk/SophyaProg/Tests/tobjio.cc

@@ -41 +41 @@
 
   string nom = "nt21";
-  ObjFileIO<NTuple> oiont(*nt);
+  ObjFileIO<NTuple> oiont(nt);
   oiont.Write(so, nom);
   cout << "Writing " << nom << endl;
@@ -56 +56 @@
   }
   nom = "nt22";
-  ObjFileIO<NTuple> oiont2(*nt);
+  ObjFileIO<NTuple> oiont2(nt);
   oiont2.Write(so, nom);
   cout << "Writing " << nom << endl;
@@ -72 +72 @@
     }
   nom = "h2d";
-  ObjFileIO<Histo2D> oioh(*h);
+  ObjFileIO<Histo2D> oioh(h);
   oioh.Write(so, nom);
   cout << "Writing " << nom << endl;
@@ -86 +86 @@
     { x = (2*i+1.);  h->Add(x, x*(200.-x)); }
   nom = "h1d";
-  ObjFileIO<Histo> oioh(*h);
+  ObjFileIO<Histo> oioh(h);
   oioh.Write(so, nom);
   cout << "Writing " << nom << endl;
@@ -130 +130 @@
 
   nom = "nt31";
-  ObjFileIO<NTuple> oiont(*nt);
+  ObjFileIO<NTuple> oiont(nt);
   oiont.Write(so, nom);
   cout << "Writing " << nom << endl;
@@ -143 +143 @@
     }
   nom = "nt32";
-  ObjFileIO<NTuple> oiont2(*nt);
+  ObjFileIO<NTuple> oiont2(nt);
   oiont2.Write(so, nom);
   cout << "Writing " << nom << endl;