From 93da2e8097450197dee9efb3498ac52d55562e62 Mon Sep 17 00:00:00 2001
From: Srecko Morovic <srecko.morovic@cern.ch>
Date: Mon, 21 Mar 2016 22:21:48 +0100
Subject: [PATCH] fix destination directory with new merging implementation

---
 python/anelastic.py | 6 ++++--
 scripts/hltdrpm.sh  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/python/anelastic.py b/python/anelastic.py
index fa386ec..34cb8f6 100755
--- a/python/anelastic.py
+++ b/python/anelastic.py
@@ -913,7 +913,8 @@ def writeoutError(fobj,targetpath):
                             self.datfileList.remove(datfile)
                     if not foundDat and errEntry<self.totalEvent:
                         success = False
-                        destinationpath = os.path.join(self.outdir,outfile.run,outfile.stream,outfile.name+".dat")
+                        destinationpath = os.path.join(self.outdir,outfile.run,outfile.stream,"data",outfile.name+".dat")
+                        #destinationpath = os.path.join(self.outdir,outfile.run,outfile.stream,outfile.name+".dat")
                         try:
                             try:
                                 os.stat(os.path.join(self.tempdir,outfile.run,outfile.name+".dat")).st_size
@@ -921,9 +922,10 @@ def writeoutError(fobj,targetpath):
                             except:
                                 pass
                             success = outfile.mergeDatInputs(destinationpath,conf.output_adler32)
+			    #os.rename(destinationpath_tmp,destinationpath)
                             outfile.writeout()
                             #test
-                            os.stat(os.path.join(self.outdir,outfile.run,outfile.stream,outfile.name+".dat")).st_size
+                            os.stat(destinationpath).st_size
                         except Exception as ex:
                             self.logger.fatal("Failed micro-merge: "+destinationpath)
                             self.logger.exception(ex)
diff --git a/scripts/hltdrpm.sh b/scripts/hltdrpm.sh
index b2d46d7..7e3b434 100755
--- a/scripts/hltdrpm.sh
+++ b/scripts/hltdrpm.sh
@@ -209,7 +209,7 @@ cd $TOPDIR
 cat > hltd.spec <<EOF
 Name: hltd
 Version: 1.9.3
-Release: 2
+Release: 3
 Summary: hlt daemon
 License: gpl
 Group: DAQ