Updated usage of spin indices to carry both position and value

Author: GDeLaurentis

lips/particle.py

@@ -332,9 +332,9 @@ def angles_for_squares(self):
         if self.l_sp_d is not None and self.r_sp_d is not None:  # massive scalars do not have these defined
             self._l_sp_d, self._r_sp_d = self._r_sp_d.T, self._l_sp_d.T
             if hasattr(self, 'spin_index'):
-                if self.spin_index == 'u':
+                if self.spin_index[0] == 'u':
                     self._l_sp_d *= -1
-                elif self.spin_index == 'd':
+                elif self.spin_index[0] == 'd':
                     self._r_sp_d *= -1
                 else:
                     raise Exception("Spin index not understood.")

lips/particles.py

@@ -184,7 +184,7 @@ def cluster(self, llIntegers, massive_fermions=None):
                     selfClustered[leg]._r_sp_d = selfClustered[leg]._r_sp_d @ -LeviCivita  # |bold leg> = |leg_I>
                 else:
                     raise Exception("Massive fermion spin index position must be either 'u' or 'd'.")
-                selfClustered[leg].spin_index = index_position
+                selfClustered[leg].spin_index = (index_position, index_value)
                 if isinstance(index_value, int):
                     selfClustered[leg]._r_sp_d = selfClustered[leg]._r_sp_d[:, index_value - 1:index_value]
                     selfClustered[leg]._l_sp_d = selfClustered[leg]._l_sp_d[index_value - 1:index_value, :]
@@ -272,11 +272,11 @@ def subs(self, myDict):
         for mass in self.internal_masses:
             if isinstance(getattr(self, mass), (sympy.Add, sympy.Mul, sympy.Symbol)):
                 setattr(self, mass, getattr(self, mass).subs(myDict))
-            if isinstance(getattr(self, mass), sympy.Integer) and self.field.name == "finite field":
+            if isinstance(getattr(self, mass), (sympy.Integer, ModP)) and self.field.name == "finite field":
                 setattr(self, mass, ModP(getattr(self, mass), self.field.characteristic))
-            elif isinstance(getattr(self, mass), sympy.Integer) and self.field.name == "padic":
+            elif isinstance(getattr(self, mass), (sympy.Integer, PAdic)) and self.field.name == "padic":
                 setattr(self, mass, PAdic(getattr(self, mass), self.field.characteristic, self.field.digits))
-            else:
+            elif not isinstance(getattr(self, mass), str):
                 setattr(self, mass, sympy.poly(getattr(self, mass), modulus=self.field.characteristic ** self.field.digits).as_expr())
 
     def fix_mom_cons(self, A=0, B=0, real_momenta=False, axis=1):   # using real momenta changes both |⟩ and |] of A & B