newly added. Not for productive used yetsvn diff | grep Index:

2008-01-08 08:31:58 +00:00
commit c6cc508aaf
85 changed files with 14397 additions and 0 deletions
--- a/src/classes/PFitterFcn.cpp
+++ b/src/classes/PFitterFcn.cpp
@ -0,0 +1,99 @@
+/***************************************************************************
+
+  PFitterFcn.cpp
+
+  Author: Andreas Suter
+  e-mail: andreas.suter@psi.ch
+
+  $Id$
+
+***************************************************************************/
+
+/***************************************************************************
+ *   Copyright (C) 2007 by Andreas Suter                                   *
+ *   andreas.suter@psi.c                                                   *
+ *                                                                         *
+ *   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  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <iostream>
+using namespace std;
+
+#include "PFitterFcn.h"
+
+//--------------------------------------------------------------------------
+// Constructor
+//--------------------------------------------------------------------------
+/**
+ * <p>
+ *
+ * \param runList
+ * \param fitType
+ */
+PFitterFcn::PFitterFcn(PRunListCollection *runList, bool useChi2)
+{
+  fUseChi2 = useChi2;
+
+  if (fUseChi2)
+    fUp = 1.0;
+  else
+    fUp = 0.5;
+
+  fRunListCollection = runList;
+}
+
+//--------------------------------------------------------------------------
+// Destructor
+//--------------------------------------------------------------------------
+/**
+ * <p>
+ */
+PFitterFcn::~PFitterFcn()
+{
+}
+
+//--------------------------------------------------------------------------
+/**
+ * <p>
+ *
+ * \param par
+ */
+double PFitterFcn::operator()(const std::vector<double>& par) const
+{
+  double value = 0.0;
+
+  if (fUseChi2) { // chi square
+    value += fRunListCollection->GetSingleHistoChisq(par);
+    value += fRunListCollection->GetAsymmetryChisq(par);
+    value += fRunListCollection->GetRRFChisq(par);
+    value += fRunListCollection->GetNonMusrChisq(par);
+  } else { // max likelyhood
+    value += fRunListCollection->GetSingleHistoMaximumLikelihood(par);
+    value += fRunListCollection->GetAsymmetryMaximumLikelihood(par);
+    value += fRunListCollection->GetRRFMaximumLikelihood(par);
+    value += fRunListCollection->GetNonMusrMaximumLikelihood(par);
+  }
+
+// cout << endl;
+// for (unsigned int i=0; i<par.size(); i++) {
+//   cout << par[i] << ", ";
+// }
+//cout << endl << "chisq = " << value;
+// cout << endl << "------" << endl;
+
+  return value;
+}
+