fix destination directory with new merging implementation

cmsdaq · Mar 21, 2016 · 93da2e8 · 93da2e8
1 parent 26c8207
commit 93da2e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/python/anelastic.py b/python/anelastic.py
@@ -913,17 +913,19 @@ 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
                                 self.logger.warning('file exists, but not previously detected? '+os.path.join(self.tempdir,outfile.run,outfile.name+".dat"))
                             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
@@ -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