]> www.ginac.de Git - ginac.git/blobdiff - ginac/clifford.cpp
dirac_slash() called the wrong clifford constructor
[ginac.git] / ginac / clifford.cpp
index af8b749c34a453fadff041722785ca71fd0cd1ab..2a78d1a39db00635c6fb4846316c8a85e11ee19f 100644 (file)
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's clifford algebra (Dirac gamma) objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <iostream>
-#include <stdexcept>
-
 #include "clifford.h"
+
 #include "ex.h"
 #include "idx.h"
 #include "ncmul.h"
 #include "symmetry.h"
 #include "lst.h"
 #include "relational.h"
+#include "operators.h"
+#include "add.h"
 #include "mul.h"
-#include "print.h"
+#include "power.h"
+#include "matrix.h"
 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(clifford, indexed)
-GINAC_IMPLEMENT_REGISTERED_CLASS(diracone, tensor)
-GINAC_IMPLEMENT_REGISTERED_CLASS(diracgamma, tensor)
-GINAC_IMPLEMENT_REGISTERED_CLASS(diracgamma5, tensor)
-GINAC_IMPLEMENT_REGISTERED_CLASS(diracgammaL, tensor)
-GINAC_IMPLEMENT_REGISTERED_CLASS(diracgammaR, tensor)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(clifford, indexed,
+  print_func<print_dflt>(&clifford::do_print_dflt).
+  print_func<print_latex>(&clifford::do_print_latex))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(diracone, tensor,
+  print_func<print_dflt>(&diracone::do_print).
+  print_func<print_latex>(&diracone::do_print_latex))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(cliffordunit, tensor,
+  print_func<print_dflt>(&cliffordunit::do_print).
+  print_func<print_latex>(&cliffordunit::do_print_latex))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(diracgamma, cliffordunit,
+  print_func<print_dflt>(&diracgamma::do_print).
+  print_func<print_latex>(&diracgamma::do_print_latex))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(diracgamma5, tensor,
+  print_func<print_dflt>(&diracgamma5::do_print).
+  print_func<print_latex>(&diracgamma5::do_print_latex))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(diracgammaL, tensor,
+  print_func<print_context>(&diracgammaL::do_print).
+  print_func<print_latex>(&diracgammaL::do_print_latex))
+
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(diracgammaR, tensor,
+  print_func<print_context>(&diracgammaR::do_print).
+  print_func<print_latex>(&diracgammaR::do_print_latex))
 
 //////////
-// default ctor, dtor, copy ctor, assignment operator and helpers
+// default constructors
 //////////
 
-clifford::clifford() : representation_label(0)
+static ex default_metric()
 {
-       tinfo_key = TINFO_clifford;
+       static ex m = (new minkmetric)->setflag(status_flags::dynallocated);
+       return m;
 }
 
-void clifford::copy(const clifford & other)
+clifford::clifford() : representation_label(0), metric(default_metric())
 {
-       inherited::copy(other);
-       representation_label = other.representation_label;
+       tinfo_key = TINFO_clifford;
 }
 
-DEFAULT_DESTROY(clifford)
-DEFAULT_CTORS(diracone)
-DEFAULT_CTORS(diracgamma)
-DEFAULT_CTORS(diracgamma5)
-DEFAULT_CTORS(diracgammaL)
-DEFAULT_CTORS(diracgammaR)
+DEFAULT_CTOR(diracone)
+DEFAULT_CTOR(cliffordunit)
+DEFAULT_CTOR(diracgamma)
+DEFAULT_CTOR(diracgamma5)
+DEFAULT_CTOR(diracgammaL)
+DEFAULT_CTOR(diracgammaR)
 
 //////////
 // other constructors
@@ -75,26 +97,27 @@ DEFAULT_CTORS(diracgammaR)
 /** Construct object without any indices. This constructor is for internal
  *  use only. Use the dirac_ONE() function instead.
  *  @see dirac_ONE */
-clifford::clifford(const ex & b, unsigned char rl) : inherited(b), representation_label(rl)
+clifford::clifford(const ex & b, unsigned char rl) : inherited(b), representation_label(rl), metric(0)
 {
        tinfo_key = TINFO_clifford;
 }
 
 /** Construct object with one Lorentz index. This constructor is for internal
- *  use only. Use the dirac_gamma() function instead.
+ *  use only. Use the clifford_unit() or dirac_gamma() functions instead.
+ *  @see clifford_unit
  *  @see dirac_gamma */
-clifford::clifford(const ex & b, const ex & mu, unsigned char rl) : inherited(b, mu), representation_label(rl)
+clifford::clifford(const ex & b, const ex & mu, const ex & metr, unsigned char rl) : inherited(b, mu), representation_label(rl), metric(metr)
 {
        GINAC_ASSERT(is_a<varidx>(mu));
        tinfo_key = TINFO_clifford;
 }
 
-clifford::clifford(unsigned char rl, const exvector & v, bool discardable) : inherited(sy_none(), v, discardable), representation_label(rl)
+clifford::clifford(unsigned char rl, const ex & metr, const exvector & v, bool discardable) : inherited(not_symmetric(), v, discardable), representation_label(rl), metric(metr)
 {
        tinfo_key = TINFO_clifford;
 }
 
-clifford::clifford(unsigned char rl, exvector * vp) : inherited(sy_none(), vp), representation_label(rl)
+clifford::clifford(unsigned char rl, const ex & metr, std::auto_ptr<exvector> vp) : inherited(not_symmetric(), vp), representation_label(rl), metric(metr)
 {
        tinfo_key = TINFO_clifford;
 }
@@ -103,21 +126,24 @@ clifford::clifford(unsigned char rl, exvector * vp) : inherited(sy_none(), vp),
 // archiving
 //////////
 
-clifford::clifford(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
+clifford::clifford(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
 {
        unsigned rl;
        n.find_unsigned("label", rl);
        representation_label = rl;
+       n.find_ex("metric", metric, sym_lst);
 }
 
 void clifford::archive(archive_node &n) const
 {
        inherited::archive(n);
        n.add_unsigned("label", representation_label);
+       n.add_ex("metric", metric);
 }
 
 DEFAULT_UNARCHIVE(clifford)
 DEFAULT_ARCHIVING(diracone)
+DEFAULT_ARCHIVING(cliffordunit)
 DEFAULT_ARCHIVING(diracgamma)
 DEFAULT_ARCHIVING(diracgamma5)
 DEFAULT_ARCHIVING(diracgammaL)
@@ -127,6 +153,21 @@ DEFAULT_ARCHIVING(diracgammaR)
 // functions overriding virtual functions from base classes
 //////////
 
+ex clifford::get_metric(const ex & i, const ex & j) const
+{
+       return indexed(metric, symmetric2(), i, j);
+}
+
+bool clifford::same_metric(const ex & other) const
+{
+       if (is_a<clifford>(other)) {
+               return get_metric().is_equal(ex_to<clifford>(other).get_metric());
+       } else if (is_a<indexed>(other)) {
+               return get_metric(other.op(1), other.op(2)).is_equal(other);
+       } else
+               return false;
+}
+
 int clifford::compare_same_type(const basic & other) const
 {
        GINAC_ASSERT(is_a<clifford>(other));
@@ -145,38 +186,46 @@ bool clifford::match_same_type(const basic & other) const
        GINAC_ASSERT(is_a<clifford>(other));
        const clifford &o = static_cast<const clifford &>(other);
 
-       return representation_label == o.representation_label;
+       return (representation_label == o.representation_label) && same_metric(o);
 }
 
-void clifford::print(const print_context & c, unsigned level) const
+static bool is_dirac_slash(const ex & seq0)
 {
-       if (!is_a<diracgamma5>(seq[0]) && !is_a<diracgammaL>(seq[0]) &&
-           !is_a<diracgammaR>(seq[0]) && !is_a<diracgamma>(seq[0]) &&
-           !is_a<diracone>(seq[0])) {
+       return !is_a<diracgamma5>(seq0) && !is_a<diracgammaL>(seq0) &&
+              !is_a<diracgammaR>(seq0) && !is_a<cliffordunit>(seq0) &&
+              !is_a<diracone>(seq0);
+}
 
-               // dirac_slash() object is printed differently
-               if (is_a<print_tree>(c))
-                       inherited::print(c, level);
-               else if (is_a<print_latex>(c)) {
-                       c.s << "{";
-                       seq[0].print(c, level);
-                       c.s << "\\hspace{-1.0ex}/}";
-               } else {
-                       seq[0].print(c, level);
-                       c.s << "\\";
-               }
+void clifford::do_print_dflt(const print_dflt & c, unsigned level) const
+{
+       // dirac_slash() object is printed differently
+       if (is_dirac_slash(seq[0])) {
+               seq[0].print(c, level);
+               c.s << "\\";
+       } else
+               this->print_dispatch<inherited>(c, level);
+}
 
+void clifford::do_print_latex(const print_latex & c, unsigned level) const
+{
+       // dirac_slash() object is printed differently
+       if (is_dirac_slash(seq[0])) {
+               c.s << "{";
+               seq[0].print(c, level);
+               c.s << "\\hspace{-1.0ex}/}";
        } else
-               inherited::print(c, level);
+               this->print_dispatch<inherited>(c, level);
 }
 
 DEFAULT_COMPARE(diracone)
+DEFAULT_COMPARE(cliffordunit)
 DEFAULT_COMPARE(diracgamma)
 DEFAULT_COMPARE(diracgamma5)
 DEFAULT_COMPARE(diracgammaL)
 DEFAULT_COMPARE(diracgammaR)
 
 DEFAULT_PRINT_LATEX(diracone, "ONE", "\\mathbb{1}")
+DEFAULT_PRINT_LATEX(cliffordunit, "e", "e")
 DEFAULT_PRINT_LATEX(diracgamma, "gamma", "\\gamma")
 DEFAULT_PRINT_LATEX(diracgamma5, "gamma5", "{\\gamma^5}")
 DEFAULT_PRINT_LATEX(diracgammaL, "gammaL", "{\\gamma_L}")
@@ -188,7 +237,7 @@ static void base_and_index(const ex & c, ex & b, ex & i)
        GINAC_ASSERT(is_a<clifford>(c));
        GINAC_ASSERT(c.nops() == 2);
 
-       if (is_a<diracgamma>(c.op(0))) { // proper dirac gamma object
+       if (is_a<cliffordunit>(c.op(0))) { // proper dirac gamma object or clifford unit
                i = c.op(1);
                b = _ex1;
        } else if (is_a<diracgamma5>(c.op(0)) || is_a<diracgammaL>(c.op(0)) || is_a<diracgammaR>(c.op(0))) { // gamma5/L/R
@@ -208,7 +257,10 @@ bool diracgamma::contract_with(exvector::iterator self, exvector::iterator other
        GINAC_ASSERT(is_a<indexed>(*other));
        GINAC_ASSERT(is_a<diracgamma>(self->op(0)));
        unsigned char rl = ex_to<clifford>(*self).get_representation_label();
+
        ex dim = ex_to<idx>(self->op(1)).get_dim();
+       if (other->nops() > 1)
+               dim = minimal_dim(dim, ex_to<idx>(other->op(1)).get_dim());
 
        if (is_a<clifford>(*other)) {
 
@@ -289,10 +341,109 @@ bool diracgamma::contract_with(exvector::iterator self, exvector::iterator other
        return false;
 }
 
+/** An utility function looking for a given metric within an exvector,
+ *  used in cliffordunit::contract_with(). */
+static int find_same_metric(exvector & v, ex & c)
+{
+       for (int i=0; i<v.size();i++) {
+               if (!is_a<clifford>(v[i]) && is_a<indexed>(v[i])
+                   && ex_to<clifford>(c).same_metric(v[i]) 
+                   && (ex_to<varidx>(c.op(1)) == ex_to<indexed>(v[i]).get_indices()[0]
+                       || ex_to<varidx>(c.op(1)).toggle_variance() == ex_to<indexed>(v[i]).get_indices()[0])) {
+                       return ++i; // next to found
+               }
+       }
+       return 0; //nothing found
+}
+
+/** Contraction of a Clifford unit with something else. */
+bool cliffordunit::contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const
+{
+       GINAC_ASSERT(is_a<clifford>(*self));
+       GINAC_ASSERT(is_a<indexed>(*other));
+       GINAC_ASSERT(is_a<cliffordunit>(self->op(0)));
+       clifford unit = ex_to<clifford>(*self);
+       unsigned char rl = unit.get_representation_label();
+
+       if (is_a<clifford>(*other)) {
+               // Contraction only makes sense if the represenation labels are equal
+               // and the metrics are the same
+               if ((ex_to<clifford>(*other).get_representation_label() != rl) 
+                   && unit.same_metric(*other))
+                       return false;
+
+               // Find if a previous contraction produces the square of self
+               int prev_square = find_same_metric(v, self[0]);
+               varidx d((new symbol)->setflag(status_flags::dynallocated), ex_to<idx>(ex_to<idx>(self->op(1)).get_dim()));
+               ex squared_metric = unit.get_metric(self->op(1), d) * unit.get_metric(d.toggle_variance(), other->op(1));
+
+               // e~mu e.mu = Tr ONE
+               if (other - self == 1) {
+                       if (prev_square != 0) {
+                               *self = squared_metric;
+                               v[prev_square-1] = _ex1;
+                       } else
+                               *self = unit.get_metric(self->op(1), other->op(1));
+                       *other = dirac_ONE(rl);
+                       return true;
+
+               // e~mu e~alpha e.mu = (2e~alpha^2-Tr) e~alpha
+               } else if (other - self == 2
+                       && is_a<clifford>(self[1])) {
+
+                       const ex & ia = self[1].op(1);
+                       const ex & ib = self[1].op(1);
+                       if (is_a<tensmetric>(unit.get_metric()))
+                               *self = 2 - unit.get_metric(self->op(1), other->op(1));
+                       else if (prev_square != 0) {
+                               *self = 2-squared_metric;
+                               v[prev_square-1] = _ex1;
+                       } else 
+                               *self = 2*unit.get_metric(ia, ib) - unit.get_metric(self->op(1), other->op(1));
+                       *other = _ex1;
+                       return true;
+
+               // e~mu S e~alpha e.mu = 2 e~alpha^3 S - e~mu S e.mu e~alpha
+               // (commutate contracted indices towards each other, simplify_indexed()
+               // will re-expand and re-run the simplification)
+               } else {
+                       exvector::iterator it = self + 1, next_to_last = other - 1;
+                       while (it != other) {
+                               if (!is_a<clifford>(*it))
+                                       return false;
+                               ++it;
+                       }
+
+                       it = self + 1;
+                       ex S = _ex1;
+                       while (it != next_to_last) {
+                               S *= *it;
+                               *it++ = _ex1;
+                       }
+
+                       const ex & ia = next_to_last->op(1);
+                       const ex & ib = next_to_last->op(1);
+                       if (is_a<tensmetric>(unit.get_metric()))
+                               *self = 2 * (*next_to_last) * S - (*self) * S * (*other) * (*next_to_last);
+                       else if (prev_square != 0) {
+                               *self = 2 * (*next_to_last) * S  - (*self) * S * (*other) * (*next_to_last)*unit.get_metric(self->op(1),self->op(1));
+                               v[prev_square-1] = _ex1;
+                       } else 
+                               *self = 2 * (*next_to_last) * S* unit.get_metric(ia,ib) - (*self) * S * (*other) * (*next_to_last);
+                       *next_to_last = _ex1;
+                       *other = _ex1;
+                       return true;
+               }
+
+       } 
+
+       return false;
+}
+
 /** Perform automatic simplification on noncommutative product of clifford
  *  objects. This removes superfluous ONEs, permutes gamma5/L/R's to the front
  *  and removes squares of gamma objects. */
-ex clifford::simplify_ncmul(const exvector & v) const
+ex clifford::eval_ncmul(const exvector & v) const
 {
        exvector s;
        s.reserve(v.size());
@@ -391,15 +542,15 @@ ex clifford::simplify_ncmul(const exvector & v) const
 
                        const ex & ag = a.op(0);
                        const ex & bg = b.op(0);
-                       bool a_is_diracgamma = is_a<diracgamma>(ag);
-                       bool b_is_diracgamma = is_a<diracgamma>(bg);
+                       bool a_is_cliffordunit = is_a<cliffordunit>(ag);
+                       bool b_is_cliffordunit =  is_a<cliffordunit>(bg);
 
-                       if (a_is_diracgamma && b_is_diracgamma) {
+                       if (a_is_cliffordunit && b_is_cliffordunit && ex_to<clifford>(a).same_metric(b)) {
 
                                const ex & ia = a.op(1);
                                const ex & ib = b.op(1);
                                if (ia.is_equal(ib)) { // gamma~alpha gamma~alpha -> g~alpha~alpha
-                                       a = lorentz_g(ia, ib);
+                                       a = ex_to<clifford>(a).get_metric(ia, ib);
                                        b = dirac_ONE(representation_label);
                                        something_changed = true;
                                }
@@ -436,10 +587,11 @@ ex clifford::simplify_ncmul(const exvector & v) const
                                a = dirac_ONE(representation_label);
                                something_changed = true;
 
-                       } else if (!a_is_diracgamma && !b_is_diracgamma && ag.is_equal(bg)) {
+                       } else if (!a_is_cliffordunit && !b_is_cliffordunit && ag.is_equal(bg)) {
 
                                // a\ a\ -> a^2
-                               varidx ix((new symbol)->setflag(status_flags::dynallocated), ex_to<idx>(a.op(1)).get_dim());
+                               varidx ix((new symbol)->setflag(status_flags::dynallocated), ex_to<idx>(a.op(1)).minimal_dim(ex_to<idx>(b.op(1))));
+                               
                                a = indexed(ag, ix) * indexed(ag, ix.toggle_variance());
                                b = dirac_ONE(representation_label);
                                something_changed = true;
@@ -450,19 +602,34 @@ ex clifford::simplify_ncmul(const exvector & v) const
        if (s.empty())
                return clifford(diracone(), representation_label) * sign;
        if (something_changed)
-               return nonsimplified_ncmul(s) * sign;
+               return reeval_ncmul(s) * sign;
        else
-               return simplified_ncmul(s) * sign;
+               return hold_ncmul(s) * sign;
 }
 
-ex clifford::thisexprseq(const exvector & v) const
+ex clifford::thiscontainer(const exvector & v) const
 {
-       return clifford(representation_label, v);
+       return clifford(representation_label, get_metric(), v);
 }
 
-ex clifford::thisexprseq(exvector * vp) const
+ex clifford::thiscontainer(std::auto_ptr<exvector> vp) const
 {
-       return clifford(representation_label, vp);
+       return clifford(representation_label, get_metric(), vp);
+}
+
+ex diracgamma5::conjugate() const
+{      
+       return _ex_1 * (*this);
+}
+
+ex diracgammaL::conjugate() const
+{
+       return (new diracgammaR)->setflag(status_flags::dynallocated);
+}
+
+ex diracgammaR::conjugate() const
+{
+       return (new diracgammaL)->setflag(status_flags::dynallocated);
 }
 
 //////////
@@ -471,40 +638,46 @@ ex clifford::thisexprseq(exvector * vp) const
 
 ex dirac_ONE(unsigned char rl)
 {
-       return clifford(diracone(), rl);
+       static ex ONE = (new diracone)->setflag(status_flags::dynallocated);
+       return clifford(ONE, rl);
+}
+
+ex clifford_unit(const ex & mu, const ex & metr, unsigned char rl)
+{
+       static ex unit = (new cliffordunit)->setflag(status_flags::dynallocated);
+
+       if (!is_a<varidx>(mu))
+               throw(std::invalid_argument("index of Clifford unit must be of type varidx"));
+
+       return clifford(unit, mu, metr, rl);
 }
 
 ex dirac_gamma(const ex & mu, unsigned char rl)
 {
+       static ex gamma = (new diracgamma)->setflag(status_flags::dynallocated);
+
        if (!is_a<varidx>(mu))
                throw(std::invalid_argument("index of Dirac gamma must be of type varidx"));
 
-       return clifford(diracgamma(), mu, rl);
+       return clifford(gamma, mu, default_metric(), rl);
 }
 
 ex dirac_gamma5(unsigned char rl)
 {
-       return clifford(diracgamma5(), rl);
+       static ex gamma5 = (new diracgamma5)->setflag(status_flags::dynallocated);
+       return clifford(gamma5, rl);
 }
 
 ex dirac_gammaL(unsigned char rl)
 {
-       return clifford(diracgammaL(), rl);
+       static ex gammaL = (new diracgammaL)->setflag(status_flags::dynallocated);
+       return clifford(gammaL, rl);
 }
 
 ex dirac_gammaR(unsigned char rl)
 {
-       return clifford(diracgammaR(), rl);
-}
-
-ex dirac_gamma6(unsigned char rl)
-{
-       return clifford(diracone(), rl) + clifford(diracgamma5(), rl);
-}
-
-ex dirac_gamma7(unsigned char rl)
-{
-       return clifford(diracone(), rl) - clifford(diracgamma5(), rl);
+       static ex gammaR = (new diracgammaR)->setflag(status_flags::dynallocated);
+       return clifford(gammaR, rl);
 }
 
 ex dirac_slash(const ex & e, const ex & dim, unsigned char rl)
@@ -512,7 +685,7 @@ ex dirac_slash(const ex & e, const ex & dim, unsigned char rl)
        // Slashed vectors are actually stored as a clifford object with the
        // vector as its base expression and a (dummy) index that just serves
        // for storing the space dimensionality
-       return clifford(e, varidx(0, dim), rl);
+       return clifford(e, varidx(0, dim), default_metric(), rl);
 }
 
 /** Check whether a given tinfo key (as returned by return_type_tinfo()
@@ -531,13 +704,13 @@ static bool is_clifford_tinfo(unsigned ti)
 
 /** Take trace of a string of an even number of Dirac gammas given a vector
  *  of indices. */
-static ex trace_string(exvector::const_iterator ix, unsigned num)
+static ex trace_string(exvector::const_iterator ix, size_t num)
 {
        // Tr gamma.mu gamma.nu = 4 g.mu.nu
        if (num == 2)
                return lorentz_g(ix[0], ix[1]);
 
-       // Tr gamma.mu gamma.nu gamma.rho gamma.sig = 4 (g.mu.nu g.rho.sig + g.nu.rho g.mu.sig - g.mu.rho g.nu.sig
+       // Tr gamma.mu gamma.nu gamma.rho gamma.sig = 4 (g.mu.nu g.rho.sig + g.nu.rho g.mu.sig - g.mu.rho g.nu.sig )
        else if (num == 4)
                return lorentz_g(ix[0], ix[1]) * lorentz_g(ix[2], ix[3])
                     + lorentz_g(ix[1], ix[2]) * lorentz_g(ix[0], ix[3])
@@ -553,8 +726,8 @@ static ex trace_string(exvector::const_iterator ix, unsigned num)
        exvector v(num - 2);
        int sign = 1;
        ex result;
-       for (unsigned i=1; i<num; i++) {
-               for (unsigned n=1, j=0; n<num; n++) {
+       for (size_t i=1; i<num; i++) {
+               for (size_t n=1, j=0; n<num; n++) {
                        if (n == i)
                                continue;
                        v[j++] = ix[n];
@@ -579,11 +752,11 @@ ex dirac_trace(const ex & e, unsigned char rl, const ex & trONE)
                else
                        return _ex0;
 
-       } else if (is_ex_exactly_of_type(e, mul)) {
+       } else if (is_exactly_a<mul>(e)) {
 
                // Trace of product: pull out non-clifford factors
                ex prod = _ex1;
-               for (unsigned i=0; i<e.nops(); i++) {
+               for (size_t i=0; i<e.nops(); i++) {
                        const ex &o = e.op(i);
                        if (is_clifford_tinfo(o.return_type_tinfo(), rl))
                                prod *= dirac_trace(o, rl, trONE);
@@ -592,7 +765,7 @@ ex dirac_trace(const ex & e, unsigned char rl, const ex & trONE)
                }
                return prod;
 
-       } else if (is_ex_exactly_of_type(e, ncmul)) {
+       } else if (is_exactly_a<ncmul>(e)) {
 
                if (!is_clifford_tinfo(e.return_type_tinfo(), rl))
                        return _ex0;
@@ -601,13 +774,13 @@ ex dirac_trace(const ex & e, unsigned char rl, const ex & trONE)
                ex e_expanded = e.subs(lst(
                        dirac_gammaL(rl) == (dirac_ONE(rl)-dirac_gamma5(rl))/2,
                        dirac_gammaR(rl) == (dirac_ONE(rl)+dirac_gamma5(rl))/2
-               )).expand();
+               ), subs_options::no_pattern).expand();
                if (!is_a<ncmul>(e_expanded))
                        return dirac_trace(e_expanded, rl, trONE);
 
                // gamma5 gets moved to the front so this check is enough
                bool has_gamma5 = is_a<diracgamma5>(e.op(0).op(0));
-               unsigned num = e.nops();
+               size_t num = e.nops();
 
                if (has_gamma5) {
 
@@ -631,23 +804,23 @@ ex dirac_trace(const ex & e, unsigned char rl, const ex & trONE)
                        //   I/4! * epsilon0123.mu1.mu2.mu3.mu4 * Tr gamma.mu1 gamma.mu2 gamma.mu3 gamma.mu4 S_2k
                        // (the epsilon is always 4-dimensional)
                        exvector ix(num-1), bv(num-1);
-                       for (unsigned i=1; i<num; i++)
+                       for (size_t i=1; i<num; i++)
                                base_and_index(e.op(i), bv[i-1], ix[i-1]);
                        num--;
                        int *iv = new int[num];
                        ex result;
-                       for (unsigned i=0; i<num-3; i++) {
+                       for (size_t i=0; i<num-3; i++) {
                                ex idx1 = ix[i];
-                               for (unsigned j=i+1; j<num-2; j++) {
+                               for (size_t j=i+1; j<num-2; j++) {
                                        ex idx2 = ix[j];
-                                       for (unsigned k=j+1; k<num-1; k++) {
+                                       for (size_t k=j+1; k<num-1; k++) {
                                                ex idx3 = ix[k];
-                                               for (unsigned l=k+1; l<num; l++) {
+                                               for (size_t l=k+1; l<num; l++) {
                                                        ex idx4 = ix[l];
                                                        iv[0] = i; iv[1] = j; iv[2] = k; iv[3] = l;
                                                        exvector v;
                                                        v.reserve(num - 4);
-                                                       for (unsigned n=0, t=4; n<num; n++) {
+                                                       for (size_t n=0, t=4; n<num; n++) {
                                                                if (n == i || n == j || n == k || n == l)
                                                                        continue;
                                                                iv[t++] = n;
@@ -678,7 +851,7 @@ ex dirac_trace(const ex & e, unsigned char rl, const ex & trONE)
                        }
 
                        exvector iv(num), bv(num);
-                       for (unsigned i=0; i<num; i++)
+                       for (size_t i=0; i<num; i++)
                                base_and_index(e.op(i), bv[i], iv[i]);
 
                        return trONE * (trace_string(iv.begin(), num) * mul(bv)).simplify_indexed();
@@ -697,21 +870,21 @@ ex dirac_trace(const ex & e, unsigned char rl, const ex & trONE)
 ex canonicalize_clifford(const ex & e)
 {
        // Scan for any ncmul objects
-       lst srl;
+       exmap srl;
        ex aux = e.to_rational(srl);
-       for (unsigned i=0; i<srl.nops(); i++) {
+       for (exmap::iterator i = srl.begin(); i != srl.end(); ++i) {
 
-               ex lhs = srl.op(i).lhs();
-               ex rhs = srl.op(i).rhs();
+               ex lhs = i->first;
+               ex rhs = i->second;
 
-               if (is_ex_exactly_of_type(rhs, ncmul)
+               if (is_exactly_a<ncmul>(rhs)
                 && rhs.return_type() == return_types::noncommutative
                 && is_clifford_tinfo(rhs.return_type_tinfo())) {
 
                        // Expand product, if necessary
                        ex rhs_expanded = rhs.expand();
                        if (!is_a<ncmul>(rhs_expanded)) {
-                               srl.let_op(i) = (lhs == canonicalize_clifford(rhs_expanded));
+                               i->second = canonicalize_clifford(rhs_expanded);
                                continue;
 
                        } else if (!is_a<clifford>(rhs.op(0)))
@@ -719,7 +892,7 @@ ex canonicalize_clifford(const ex & e)
 
                        exvector v;
                        v.reserve(rhs.nops());
-                       for (unsigned j=0; j<rhs.nops(); j++)
+                       for (size_t j=0; j<rhs.nops(); j++)
                                v.push_back(rhs.op(j));
 
                        // Stupid recursive bubble sort because we only want to swap adjacent gammas
@@ -732,13 +905,13 @@ ex canonicalize_clifford(const ex & e)
                                        ex b1, i1, b2, i2;
                                        base_and_index(it[0], b1, i1);
                                        base_and_index(it[1], b2, i2);
-                                       it[0] = (lorentz_g(i1, i2) * b1 * b2).simplify_indexed();
-                                       it[1] = _ex2;
+                                       it[0] = (ex_to<clifford>(save0).get_metric(i1, i2) * b1 * b2).simplify_indexed();
+                                       it[1] = v.size() == 2 ? _ex2 * dirac_ONE(ex_to<clifford>(it[1]).get_representation_label()) : _ex2;
                                        ex sum = ncmul(v);
                                        it[0] = save1;
                                        it[1] = save0;
                                        sum -= ncmul(v, true);
-                                       srl.let_op(i) = (lhs == canonicalize_clifford(sum));
+                                       i->second = canonicalize_clifford(sum);
                                        goto next_sym;
                                }
                                ++it;
@@ -746,7 +919,86 @@ ex canonicalize_clifford(const ex & e)
 next_sym:      ;
                }
        }
-       return aux.subs(srl).simplify_indexed();
+       return aux.subs(srl, subs_options::no_pattern).simplify_indexed();
+}
+
+ex clifford_prime(const ex &e)
+{
+       pointer_to_map_function fcn(clifford_prime);
+       if (is_a<clifford>(e) && is_a<cliffordunit>(e.op(0))) {
+               return -e;
+       } else if (is_a<add>(e)) {
+               return e.map(fcn);
+       } else if (is_a<ncmul>(e)) {
+               return e.map(fcn);
+       } else if (is_a<power>(e)) {
+               return pow(clifford_prime(e.op(0)), e.op(1));
+       } else
+               return e;
+}
+
+ex delete_ONE(const ex &e)
+{
+       pointer_to_map_function fcn(delete_ONE);
+       if (is_a<clifford>(e) && is_a<diracone>(e.op(0))) {
+               return 1;
+       } else if (is_a<add>(e)) {
+               return e.map(fcn);
+       } else if (is_a<ncmul>(e)) {
+               return e.map(fcn);
+       } else if (is_a<mul>(e)) {
+               return e.map(fcn);
+       } else if (is_a<power>(e)) {
+               return pow(delete_ONE(e.op(0)), e.op(1));
+       } else
+               return e;
+}
+
+ex clifford_norm(const ex &e)
+{
+       return sqrt(delete_ONE((e * clifford_bar(e)).simplify_indexed()));
+}
+
+ex clifford_inverse(const ex &e)
+{
+       ex norm = clifford_norm(e);
+       if (!norm.is_zero())
+               return clifford_bar(e) / pow(norm, 2);
 }
 
+ex lst_to_clifford(const ex & v, const ex & mu, const ex & metr, unsigned char rl)
+{
+       unsigned min, max;
+       if (!ex_to<idx>(mu).is_dim_numeric())
+               throw(std::invalid_argument("Index should have a numeric dimension"));
+       unsigned dim = (ex_to<numeric>(ex_to<idx>(mu).get_dim())).to_int();
+       ex c = clifford_unit(mu, metr, rl);
+
+       if (is_a<matrix>(v)) {
+               if (ex_to<matrix>(v).cols() > ex_to<matrix>(v).rows()) {
+                       min = ex_to<matrix>(v).rows();
+                       max = ex_to<matrix>(v).cols();
+               } else {
+                       min = ex_to<matrix>(v).cols();
+                       max = ex_to<matrix>(v).rows();
+               }
+               if (min == 1) {
+                       if (dim == max)
+                               if (is_a<varidx>(mu)) // need to swap variance
+                                       return indexed(v, ex_to<varidx>(mu).toggle_variance()) * c;
+                               else
+                                       return indexed(v, mu) * c;
+                       else
+                               throw(std::invalid_argument("Dimensions of vector and clifford unit mismatch"));
+               } else
+                       throw(std::invalid_argument("First argument should be a vector vector"));
+       } else if (is_a<lst>(v)) {
+               if (dim == ex_to<lst>(v).nops())
+                       return indexed(matrix(dim, 1, ex_to<lst>(v)), ex_to<varidx>(mu).toggle_variance()) * c;
+               else
+                       throw(std::invalid_argument("List length and dimension of clifford unit mismatch"));
+       } else
+               throw(std::invalid_argument("Cannot construct from anything but list or vector"));
+}
 } // namespace GiNaC