Changeset 317 for MEMPHYS

Timestamp:

Apr 19, 2007, 3:45:50 PM (17 years ago)

Author:

barrand

Message:

 

File:

• MEMPHYS/HEAD/applications/MEMPHYS_geom.cxx (modified) (5 diffs)

MEMPHYS/HEAD/applications/MEMPHYS_geom.cxx

@@ -1 @@
-// AIDA analysis program over MEMPHYS.root file.
+// AIDA analysis program over MEMPHYS_geom.root file.
 
 // AIDA :
@@ -8 +8 @@
 #include <iostream>
 
-//////////////////////////////////////////////////////////////////////////////
-bool get_XYZ(
- AIDA::ITuple& aParent
-,int aColumn
-,double& aX
-,double& aY
-,double& aZ
-) 
-//////////////////////////////////////////////////////////////////////////////
-//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
-{
-  AIDA::ITupleEntry* entry = (AIDA::ITupleEntry*)aParent.getObject(aColumn);
-  if(!entry) return false;
-
-  AIDA::ITuple* tuple = dynamic_cast<AIDA::ITuple*>(entry);
-  if(!tuple) return false;
-
-  tuple->start();
-  if(!tuple->next()) return false;
-
-  aX = tuple->getDouble(0);
-  aY = tuple->getDouble(1);
-  aZ = tuple->getDouble(2);
-
-  return true;
-}
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -44 +18 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  AIDA::ITupleEntry* entry = (AIDA::ITupleEntry*)aParent.getObject(5);
+  AIDA::ITupleEntry* entry = (AIDA::ITupleEntry*)aParent.getObject(7);
   if(!entry) return false;
 
@@ -58 +32 @@
     //int pmtLocation = tuple->getInt(1);
 
-    double dx,dy,dz;
-    if(!get_XYZ(*tuple,2,dx,dy,dz)) return false;
-
-    double x,y,z;
-    if(!get_XYZ(*tuple,3,x,y,z)) return false;
+    double dx = tuple->getDouble(2);
+    double dy = tuple->getDouble(3);
+    double dz = tuple->getDouble(4);
+    double x = tuple->getDouble(5);
+    double y = tuple->getDouble(6);
+    double z = tuple->getDouble(7);
 
     std::cout << "----> PM{"<<irow<<"}: " 
@@ -104 +79 @@
   std::string fmt = (aArgc>=2?aArgv[1]:"root"); //file extension
 
-  AIDA::ITree* tree = treeFactory->create("MEMPHYS."+fmt,fmt,true,false);
+  AIDA::ITree* tree = treeFactory->create("MEMPHYS_geom."+fmt,fmt,true,false);
   if(!tree) {
     std::cout << header << "can't open data file." << std::endl;