removed parallel tree

src/musrgui/PFitOutputHandler.cpp

@@ -76,6 +76,27 @@ PFitOutputHandler::PFitOutputHandler(QString workingDirectory, QValueVector<QStr
   }
 }
 
+//----------------------------------------------------------------------------------------------------
+/**
+ * <p>
+ */
+PFitOutputHandler::~PFitOutputHandler()
+{
+  if (fProc->isRunning()) {
+    qDebug("fProc still running");
+    fProc->kill();
+  }
+  if (fProc->isRunning()) {
+    QString msg = "fProc still running ...";
+    qDebug(msg);
+  }
+
+  if (fProc) {
+    delete fProc;
+    fProc = 0;
+  }
+}
+
 //----------------------------------------------------------------------------------------------------
 /**
  * <p>
@@ -115,8 +136,11 @@ void PFitOutputHandler::quitButtonPressed()
 {
   // if the fitting is still taking place, kill it
   if (fProc->isRunning()) {
+/*
     fProc->tryTerminate();
     QTimer::singleShot( 100, fProc, SLOT( kill() ) );
+*/
+    fProc->kill();
   }
 
   accept();

src/musrgui/PFitOutputHandler.h

@@ -47,18 +47,19 @@ class PFitOutputHandler : public QDialog
 {
   Q_OBJECT
 
-public:
-  PFitOutputHandler(QString workingDirectory, QValueVector<QString> &cmd);
-  ~PFitOutputHandler() {}
+  public:
+    PFitOutputHandler(QString workingDirectory, QValueVector<QString> &cmd);
+    virtual ~PFitOutputHandler();
 
-private slots:
-    void readFromStdOut();
-    void readFromStdErr();
-    void quitButtonPressed();
-    void processDone();
+  private slots:
+    virtual void readFromStdOut();
+    virtual void readFromStdErr();
+    virtual void quitButtonPressed();
+    virtual void processDone();
 
 private:
     QProcess *fProc;
+
     QVBox *fVbox;
     QTextEdit *fOutput;
     QPushButton *fQuitButton;

src/tests/nonlocal/In_37_T2P83_E14P1.inp

@@ -13,7 +13,7 @@
 %   [output file name]
 
 reducedTemp = 0.8492
-lambdaL = 33.6
+lambdaL = 32.3
 xi0 = 380.0
 meanFreePath = 12000.0
 filmThickness = 500000.0

src/tests/skewedGaussianTest/paramInput.dat

@@ -16,7 +16,7 @@ asym, 0.24, 0.24, 0.24, 0.24
 phase, 0.0, 90.0, 180.0, 270.0
 #------------------------------------------------------
 # N0's
-N0, 1100, 1000, 1002, 990
+N0, 11000, 10000, 10002, 9990
 #------------------------------------------------------
 # bkg's
 bkg, 2, 1, 2, 3

src/tests/skewedGaussianTest/skewedGaussian.C

@@ -42,11 +42,11 @@ void skewedGaussian()
   char fln[256];
 
   const Double_t w  = 1.0;   // weight of the skewed Gaussian
-  const Double_t B0 = 1000.0; // skewed Gaussian B0 (G)
-  const Double_t sm = 5.0;   // skewed Gaussian sigma- (G)
-  const Double_t sp = 5.0;   // skewed Gaussian sigma+ (G)
+  const Double_t B0 = 100.0; // skewed Gaussian B0 (G)
+  const Double_t sm = 50.0;   // skewed Gaussian sigma- (G)
+  const Double_t sp = 50.0;   // skewed Gaussian sigma+ (G)
 
-  const Double_t B0ext = 1000.0; // external field Gaussian B0 (G)
+  const Double_t B0ext = 100.0; // external field Gaussian B0 (G)
   const Double_t sext  = 10;   // external field Gaussian sigma (G)
 
   sprintf(fln, "skewedGauss-B%0.2lf-sm%0.2lf-sp%0.2lf-w%0.1lf-Bext%0.2lf-sext%0.2lf.dat",