Particle masses bugfix

src/Cello/data_Particle.hpp

@@ -126,7 +126,7 @@ class Particle {
   { return particle_descr_->num_attributes(it); }
 
   /// Check if attribute exists
-
+  
   bool is_attribute (int it, std::string attribute) const
   { return particle_descr_->is_attribute(it,attribute); }
 
@@ -204,9 +204,8 @@ class Particle {
 
   /// Check if given constant exists
 
-  bool has_constant(int it, std::string constant) const
-  { return particle_descr_->has_constant(it,constant); }
-
+  bool is_constant(int it, std::string constant) const
+  { return particle_descr_->is_constant(it,constant); }
 
   //--------------------------------------------------
   // BYTES

src/Cello/data_ParticleDescr.cpp

@@ -256,10 +256,10 @@ int ParticleDescr::attribute_index (int it, std::string attribute_name) const
 bool ParticleDescr::is_attribute(int it, std::string attribute_name) const
 {
   ASSERT1("ParticleDescr::is_attribute",
-          "Trying to access unknown particle type %d",
-          it,
-          (0 <= it && it < num_types()));
-
+          "Trying to access unknown particle type '%s'",
+          type_name(it).c_str(),
+	  (0 <= it && it < num_types()));
+    
   auto iter=attribute_index_[it].find(attribute_name);
 
   int index = (iter != attribute_index_[it].end()) ? iter->second : -1;
@@ -268,6 +268,7 @@ bool ParticleDescr::is_attribute(int it, std::string attribute_name) const
 
   return !((index == -1) && (count[cello::index_static()]++ < 10));
 }
+
 //----------------------------------------------------------------------
 
 std::string ParticleDescr::attribute_name (int it, int ia) const
@@ -409,12 +410,12 @@ int ParticleDescr::constant_offset (int it, int ic) const
 
 //----------------------------------------------------------------------
 
-bool ParticleDescr::has_constant(int it, std::string constant_name) const
+bool ParticleDescr::is_constant(int it, std::string constant_name) const
 {
   ASSERT1("ParticleDescr::constant_index",
-          "Trying to access unknown particle type %d",
-          it,
-          (0 <= it && it < num_types()));
+          "Trying to access unknown particle type '%s'",
+          type_name(it).c_str(),
+	  (0 <= it && it < num_types()));
 
   auto iter=constant_index_[it].find(constant_name);
 

src/Cello/data_ParticleDescr.hpp

@@ -83,8 +83,7 @@ class ParticleDescr {
   char * constant_value (int it, int ic);
 
   /// Check if given constant exists for the given particle type
-
-  bool has_constant (int it, std::string constant) const;
+  bool is_constant (int it, std::string constant) const;
 
   //--------------------------------------------------
   // ATTRIBUTES