From 22d235848d354d059ddec3121016accfa205de89 Mon Sep 17 00:00:00 2001
From: Guillelmo Gomez Ceballos <ceballos@srv-C2C03-22.cms>
Date: Wed, 26 Mar 2014 21:45:01 +0100
Subject: [PATCH] test

---
 dataFlowMergerInLine | 69 --------------------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100755 dataFlowMergerInLine

diff --git a/dataFlowMergerInLine b/dataFlowMergerInLine
deleted file mode 100755
index 3fe50cd..0000000
--- a/dataFlowMergerInLine
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env python
-#configfile = "/opt/merger/dataFlowMerger.conf"
-#configfile = "dataFlowMergerMini.conf"
-configfile = "dataFlowMergerMacro.conf"
-
-import sys, os, socket, signal
-
-from configobj import ConfigObj
-from Logging import getLogger
-import cmsDataFlowMerger
-
-log = getLogger()
-
-def getMergeParams(mergeConfigFileName):
-    try:
-        if os.path.isfile(mergeConfigFileName):
-            config = ConfigObj(mergeConfigFileName)
-        else:
-            log.error("Configuration file not found: {0}!".format(mergeConfigFileName))
-            sys.exit(1)
-    except IOError, e:
-        log.error("Unable to open configuration file: {0}!".format(mergeConfigFileName))
-        sys.exit(1)
-
-    return config
-
-def get_params():
-    params = getMergeParams(configfile)
-
-    try:
-        in_path = params['Input']['dataPath']
-        out_path = params['Output']['dataPath']
-        eol_path = params['Input']['eolPath']
-        merge_type = params['Misc']['mergeType']
-    except KeyError, e:
-        log.error("At least one non-optional parameter missing from the config file {0}:".format(configFile))
-        log.error("{0}".format(e))
-        exit(1)
-
-    try:
-        additional_label = params['Output']['outputEndName']
-    except KeyError, e:
-        additional_label = socket.gethostname()
-
-    try:
-        delete_files = params['Misc']['deleteFiles']
-    except KeyError, e:
-        delete_files = True
-
-    try:
-        debug_level = params['Misc']['debugLevel']
-    except KeyError, e:
-        debug_level = 10
-
-    return in_path, eol_path, out_path, additional_label, merge_type, delete_files, debug_level
-
-
-
-def DataFlowMerger():
-
-   [inPath, eolPath, outPath, adLabel, mType, delOrigFiles, debugLevel] = get_params()
-
-   log.info("delFiles: {0}".format(delOrigFiles))
-
-   cmsDataFlowMerger.start_merging(inPath, eolPath, mType, outPath, adLabel, delOrigFiles, debugLevel)
-
-if __name__ == "__main__":
-
-    DataFlowMerger()