From 532b6f42ffd6019b98e9c1b61ad592211acc685e Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Mon, 14 Oct 2024 12:22:25 +0200
Subject: [PATCH] make sure that for non-muSR data errors are not = 0. Will set
 it to 1, and issue a warning. This prevents chisq to crash.

---
 doc/examples/.DS_Store          | Bin 10244 -> 0 bytes
 src/classes/PRunDataHandler.cpp |  21 ++++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 delete mode 100644 doc/examples/.DS_Store

diff --git a/doc/examples/.DS_Store b/doc/examples/.DS_Store
deleted file mode 100644
index 488187a4d379aa9776bb7398aa8a8bc13a0428b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10244
zcmeHMPjB2r6n~S3u9q~e(`4I}Khi3>AT=$U5Q-{<x@-gKiY8g@hBP59Tko!un0P%a
z+nbO^MY)0C#0P+{&=V38H%@#4ZitUit{f2jX6#LDue~Y<S`>M#nKvH4_h#ldesAX4
zM8rzn)+|w;h!kW&)pICfl6Wq1UmEgTra&3wiR$E17nzgY$DKB$2&4$42&4$42&4%7
z9}vKvEs`?g(X>nvND)X8I7UGDhdi>NMV}sdRJslnG6Vn}Mzc()BMy)<d7l=2dgM_l
z3Y}i`z<g2WhZxKg$Md{k2QB*a$fKS(F;ASB-!t<g6efFzTwbyhD|$37Qv^~3`Vp8y
z(-^%)v$zVO_}w6lOu9~Oa>y>5yxA~$1Kh&E-bcRvw@j!JokdFx+y*tsiSRxd#M{_+
zI=<c?8XePc+(O}3HgsnArL!4DQAU&pwH>}+b2Yc?lr(!&+^uqMHhOifv1aJ|b#>x4
zw_MGzbXy7-EgdZP?-^E$@0WPjYB^H2<~>ld*=$|S9Uc~D@;Bxm&*Tqp&Y?Pw`s1vU
zn||}%YJJyiTl`BoJz~Dsp;7PtxcmyW(B$`Owq<f_8|^|SLnT_Gd-2e)*TE5lF~WTs
zz==#L0*?ZCmH|*T0ibUp0QK>o28jA56#;3OS};YIw6I~ZKO^8A^PL7zjwcfVW0V$1
zrw-uQp$fh-a@vB|G12BMRx5?B<BBhj!+5JScrG3F0TN+AhlJ4v&2fNa0OB9}{8r{a
z^jix2*5u*g+&gnK`MKHI0j}$7%myjZbqU)VFhirc=X+-Mb8m*ft7^|TXI~yUH+uep
zI(Bh<Y+@{z%U!yho4hjlYF!;~XwBViTln1D+~ju2?CP7_w$Z9}w5DNgue<u^Zq0b4
z*VT&=)~eq6^rUI^paY(XlLo17(bjcK>RZ{`a&&jSu3m7OHaE=*cMR9y)<)pz#(f7n
zM%mTdWowJ0$35&8D;>e+tm(D`+9$vMz|<PLxnh;L>+<%7X4{&zt(Oi2r_k2qR>jtZ
zrgZ~#F_-CEe@L`xy7*DA@`hJYY1*qG(w^wme9E$`me$s@)5VJ4qR>_BrAxF%yYz^@
zrSIqo{Y1aeZ}gP@Vi|UYO|h$Np1sFzu{*5HK4F{eA=5nRq24z2TDTwf8SV$Hb;QOd
zVO_8%l-FQI4jq8r!Km)iO?n%rgaYoXxIP?kI`}?tI+%#jcNfyv;Qck^8wq;E$swpm
zjnT72AHyTWo>JuY8k8T8kzdA4*YVH7p}7Pt!cKx(;$~C9>8C8`Q-<e>AB}L=K|QYo
zMzaGSCh+F}4r%GJf;ulflg`-jVSS0653E{}t~StG!gwu-TD&f-Tu9gDgmEoN9X8%2
zj>}Cz4#%XBw%`f`kvmz-*ikX8WJpggVN@r2lHLidWk^#JR?qNWh&2r9O2Vp2E4Wti
zhAd;}tHfg^SMiI$DrR6G4&HGa_SPgTyyL;Q5DRjTg}HHXHGt6$En<h|INKv42x|~F
z7Sf==a~bGwA7d4}bR-&(YY^-aMv<lzffRukfWR5A&-@7J2g(2cU%<%HE>i?j1fCZH
zY<QuzP(p9L@FCi<_|~3BeuylR;5+iD6hR?aM7#VPj~nqhUIsvDD~M+zp<eXqkw?*j
c^xS_2_+JddXPGqq#~JVVYf2jbpYHhoAG`$idjJ3c

diff --git a/src/classes/PRunDataHandler.cpp b/src/classes/PRunDataHandler.cpp
index 35a38583..5bd02d4e 100644
--- a/src/classes/PRunDataHandler.cpp
+++ b/src/classes/PRunDataHandler.cpp
@@ -3697,6 +3697,8 @@ Bool_t PRunDataHandler::ReadAsciiFile()
 {
   Bool_t success = true;
 
+std::cout << "as35> in ReadAsciiFile() ..." << std::endl;
+
   // open file
   std::ifstream f;
 
@@ -3848,7 +3850,14 @@ Bool_t PRunDataHandler::ReadAsciiFile()
           break;
         }
         ey = ostr->GetString().Atof();
+        if (ey == 0) {
+          std::cerr << std::endl << ">> PRunDataHandler::ReadAsciiFile **WARNING** line no " << lineNo << ": error y = 0 which doesn't make sense. Will set it to 1.0. Please check!!";
+          std::cerr << std::endl;
+          ey = 1.0;
+        }
       } else {
+        std::cerr << std::endl << ">> PRunDataHandler::ReadAsciiFile **WARNING** line no " << lineNo << ": error y = 0 which doesn't make sense. Will set it to 1.0. Please check!!";
+        std::cerr << std::endl;
         ey = 1.0;
       }
 
@@ -4357,7 +4366,7 @@ Bool_t PRunDataHandler::ReadDatFile()
   // open file
   std::ifstream f;
 
-  // open db-file
+  // open dat-file
   f.open(fRunPathName.Data(), std::ifstream::in);
   if (!f.is_open()) {
     std::cerr << std::endl << ">> PRunDataHandler::ReadDatFile **ERROR** Couldn't open data file (" << fRunPathName.Data() << ") for reading, sorry ...";
@@ -4456,6 +4465,12 @@ Bool_t PRunDataHandler::ReadDatFile()
           idx++;
         } else { // error value
           if (isData[i-1] == 1) { // Err or PosErr hence keep it
+            if (dval == 0.0) {
+              std::cout << std::endl << ">> PRunDataHandler::ReadDatFile **WARNING** found Err value = 0. Doesn't make sense! Will set it to 1. Please check!";
+              std::cerr << std::endl << ">>  in line: " << lineNo;
+              std::cerr << std::endl;
+              dval = 1.0;
+            }
             runData.fDataNonMusr.AppendSubErrData(idx-1, dval);
           }
         }
@@ -4470,11 +4485,11 @@ Bool_t PRunDataHandler::ReadDatFile()
 
   f.close();
 
-  // got through all the data sets and if there is NO error vector set it to '0.0'
+  // got through all the data sets and if there is NO error vector set it to '1.0'
   for (UInt_t i=0; i<noOfDataSets; i++) {
     if (runData.fDataNonMusr.GetErrData()->at(i).size() == 0) {
       for (UInt_t j=0; j<runData.fDataNonMusr.GetData()->at(i).size(); j++) {
-        runData.fDataNonMusr.AppendSubErrData(i, 0.0);
+        runData.fDataNonMusr.AppendSubErrData(i, 1.0);
       }
     }
   }