Changeset 987 for trunk/source/persistency/gdml/src

Timestamp:

Apr 17, 2009, 10:58:56 AM (15 years ago)

Author:

garnier

Message:

fichiers manquants

Location:

trunk/source/persistency/gdml/src

Files:

• #G4GDMLDefine.cc# (added)
• G4GDMLEvaluator.cc (modified) (3 diffs)
• G4GDMLParameterisation.cc (added)
• G4GDMLRead.cc (added)
• G4GDMLReadDefine.cc (added)
• G4GDMLReadMaterials.cc (added)
• G4GDMLReadParamvol.cc (added)
• G4GDMLReadSetup.cc (added)
• G4GDMLReadSolids.cc (added)
• G4GDMLReadStructure.cc (added)
• G4GDMLWrite.cc (added)
• G4GDMLWriteDefine.cc (added)
• G4GDMLWriteMaterials.cc (added)
• G4GDMLWriteParamvol.cc (added)
• G4GDMLWriteSetup.cc (added)
• G4GDMLWriteSolids.cc (added)
• G4GDMLWriteStructure.cc (added)
• G4STRead.cc (added)

trunk/source/persistency/gdml/src/G4GDMLEvaluator.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLEvaluator.cc,v 1.20 2008/07/16 15:46:34 gcosmo Exp $
+// $Id: G4GDMLEvaluator.cc,v 1.22 2009/02/26 10:13:35 gcosmo Exp $
 // GEANT4 tag $ Name:$
 //
@@ -144 +144 @@
 G4String G4GDMLEvaluator::SolveBrackets(const G4String& in)
 {
-   const std::string::size_type open = in.find("[",0);
-   const std::string::size_type close = in.find("]",0);
+   std::string::size_type full  = in.size();
+   std::string::size_type open  = in.find("[",0);
+   std::string::size_type close = in.find("]",0);
 
    if (open==close) { return in; }
@@ -158 +159 @@
    std::string::size_type begin = open;
    std::string::size_type end = 0;
-
+   std::string::size_type end1 = 0;
    std::string out;
    out.append(in,0,open);
+
+   do  // Loop for all possible matrix elements in 'in' 
+   {
+     do   // SolveBrackets for one matrix element
+     { 
+       end = in.find(",",begin+1);
+       end1= in.find("]",begin+1);
+       if (end>end1)                { end = end1; }
+       if (end==std::string::npos)  { end = close;}
+      
+       std::stringstream indexStream;
+       indexStream << "_" << EvaluateInteger(in.substr(begin+1,end-begin-1))-1;
+
+       out.append(indexStream.str());
+
+       begin = end;
+
+     } while (end<close);
+    
+     if (full==close) { return out; }
+    
+     open  = in.find("[",begin);
+     close = in.find("]",begin+1);
+
+     if (open==close) { out.append(in.substr(end+1,full-end-1)); return out; }
+     out.append(in.substr(end+1,open-end-1));
+
+     begin=open;
+    
+   } while (close<full);
    
-   do
-   {
-      end = in.find(",",begin+1);
-      if (end==std::string::npos)  { end = close; }
-
-      std::stringstream indexStream;
-      indexStream << "_" << EvaluateInteger(in.substr(begin+1,end-begin-1));
-
-      out.append(indexStream.str());
-
-      begin = end;
-
-   } while (end<close);
-
    return out;
 }