Changeset 987 for trunk

Timestamp:

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

Author:

garnier

Message:

fichiers manquants

Location:

trunk/source/persistency/gdml

Files:

• History (modified) (2 diffs)
• include/G4GDMLEvaluator.hh (modified) (1 diff)
• include/G4GDMLParameterisation.hh (added)
• include/G4GDMLParser.hh (modified) (1 diff)
• include/G4GDMLParser.icc (added)
• include/G4GDMLRead.hh (added)
• include/G4GDMLReadDefine.hh (added)
• include/G4GDMLReadMaterials.hh (added)
• include/G4GDMLReadParamvol.hh (added)
• include/G4GDMLReadSetup.hh (added)
• include/G4GDMLReadSolids.hh (added)
• include/G4GDMLReadStructure.hh (added)
• include/G4GDMLWrite.hh (added)
• include/G4GDMLWriteDefine.hh (added)
• include/G4GDMLWriteMaterials.hh (added)
• include/G4GDMLWriteParamvol.hh (added)
• include/G4GDMLWriteSetup.hh (added)
• include/G4GDMLWriteSolids.hh (added)
• include/G4GDMLWriteStructure.hh (added)
• include/G4STRead.hh (added)
• src/#G4GDMLDefine.cc# (added)
• src/G4GDMLEvaluator.cc (modified) (3 diffs)
• src/G4GDMLParameterisation.cc (added)
• src/G4GDMLRead.cc (added)
• src/G4GDMLReadDefine.cc (added)
• src/G4GDMLReadMaterials.cc (added)
• src/G4GDMLReadParamvol.cc (added)
• src/G4GDMLReadSetup.cc (added)
• src/G4GDMLReadSolids.cc (added)
• src/G4GDMLReadStructure.cc (added)
• src/G4GDMLWrite.cc (added)
• src/G4GDMLWriteDefine.cc (added)
• src/G4GDMLWriteMaterials.cc (added)
• src/G4GDMLWriteParamvol.cc (added)
• src/G4GDMLWriteSetup.cc (added)
• src/G4GDMLWriteSolids.cc (added)
• src/G4GDMLWriteStructure.cc (added)
• src/G4STRead.cc (added)

trunk/source/persistency/gdml/History

@@ -1 @@
-$Id: History,v 1.98 2009/01/23 10:41:12 gcosmo Exp $
+$Id: History,v 1.101 2009/02/26 10:13:49 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+26 February 2009 Tatiana Nikitina (gdml-V09-02-04)
+- Corrected treatment of brackets and indeces for matrices in G4GDMLEvaluator.
+  Fixes problem report #1048.
+
+24 February 2009 Gabriele Cosmo (gdml-V09-02-03)
+- Removed useless 'const' qualifier from GetAuxMap() signature.
+
+19 February 2009 Gabriele Cosmo (gdml-V09-02-02)
+- Fix in G4GDMLStructure class for missing caching of auxiliary information
+  from child modules, causing auxiliary information defined within separated
+  modules to get lost and therefore not assigned to volumes.
+  Fixes problem report #1049.
 
 23 January 2009 Gabriele Cosmo (gdml-V09-02-01)

trunk/source/persistency/gdml/include/G4GDMLEvaluator.hh

@@ -26 +26 @@
 //
 // $Id: G4GDMLEvaluator.hh,v 1.16 2008/07/16 15:46:33 gcosmo Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/persistency/gdml/include/G4GDMLParser.hh

@@ -26 +26 @@
 //
 // $Id: G4GDMLParser.hh,v 1.57 2009/01/22 11:02:07 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

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;
 }