Merge branch 'develop'

drp_1dpipe/io/auxdir/parameters.json

@@ -1,98 +1,81 @@
 {
     "lambdarange": [
-        "12500",
-        "18500"
+        "3000",
+        "13000"
     ],
     "redshiftrange": [
         "0.0",
-        "5.0"
+        "6.0"
     ],
     "redshiftstep": "0.0001",
+    "redshiftsampling": "log",
     "smoothWidth": "0",
+    "method": "linemodel",
     "templateCategoryList": [
         "emission",
         "galaxy",
         "star",
         "qso"
     ],
+    "templateCatalog": {
+        "continuumRemoval": {
+            "method": "zero",
+            "medianKernelWidth": "75",
+            "decompScales": "8",
+            "binPath": "absolute_path_to_df_binaries_here"
+        }
+    },
     "continuumRemoval": {
         "method": "zero",
-        "medianKernelWidth": "300",
-        "binPath": "\/home\/aschmitt\/amazed_cluster\/gitlab\/amazed\/extern\/df_linux\/",
+        "medianKernelWidth": "400",
+        "binPath": "~\/amazed_cluster\/gitlab\/amazed\/extern\/df_centos\/",
         "decompScales": "9"
     },
-    "chisquare2solve": {
-        "overlapThreshold": "1",
-        "spectrum": {
-            "component": "raw"
-        },
-        "interpolation": "precomputedfinegrid",
-        "extinction": "no",
-        "dustfit": "yes",
-        "pdfcombination": "marg",
-        "saveintermediateresults": "no"
-    },
-    "chisquarelogsolve": {
-        "overlapThreshold": "1",
-        "spectrum": {
-            "component": "raw"
-        },
-        "interpolation": "precomputedfinegrid",
-        "extinction": "no",
-        "dustfit": "yes",
-        "pdfcombination": "marg",
-        "saveintermediateresults": "no",
-        "enablespclogrebin": "yes"
-    },
     "linemodelsolve": {
         "linemodel": {
-            "linetypefilter": "E",
+            "linetypefilter": "no",
             "lineforcefilter": "no",
-            "fittingmethod": "hybrid",
-            "fastfitlargegridstep": "0.001",
+            "fittingmethod": "individual",
             "continuumcomponent": "tplfit",
-            "rigidity": "tplshape",
-            "linewidthtype": "velocitydriven",
-            "instrumentresolution": "2350",
-            "velocityemission": "100",
+            "linewidthtype": "combined",
+            "instrumentresolution": "5000",
+            "velocityemission": "200",
             "velocityabsorption": "300",
+            "continuumreestimation": "no",
+            "rules": "all",
+            "extremacount": "5",
             "velocityfit": "yes",
+            "rigidity": "tplshape",
+            "pdfcombination": "bestchi2",
             "emvelocityfitmin": "20",
             "emvelocityfitmax": "500",
             "absvelocityfitmin": "150",
             "absvelocityfitmax": "500",
-            "continuumreestimation": "no",
-            "rules": "all",
-            "extremacount": "10",
-            "stronglinesprior": "1e-6",
-            "pdfcombination": "marg",
-            "saveintermediateresults": "no"
-        }
-    },
-    "templateCatalog": {
-        "continuumRemoval": {
-            "method": "zero",
-            "medianKernelWidth": "75",
-            "decompScales": "8",
-            "binPath": "absolute_path_to_df_binaries_here"
-        }
-    },
-    "method": "chisquarelogsolve",
-    "enablestellarsolve": "yes",
-    "stellarsolve": {
-        "starsolve": {
-            "spectrum": {
-                "component": "raw"
-            },
-            "interpolation": "precomputedfinegrid",
-            "extinction": "no",
-            "dustfit": "yes"
-        },
-        "chisquarelogsolve": {
-            "pdfcombination": "marg",
             "saveintermediateresults": "no",
-            "enablespclogrebin": "yes"
+            "tplratio_catalog": "linecatalogs_tplshapes\/linecatalogs_tplshape_ExtendedTemplatesJan2017v3_20170602_B14C_v3_emission",
+            "continuumismfit": "yes",
+            "continuumigmfit": "yes",
+            "secondpasslcfittingmethod": "no",
+            "offsets_catalog": "linecatalogs_offsets\/offsetsCatalogs_20170410_m150",
+            "emvelocityfitstep": "50",
+            "absvelocityfitstep": "50",
+            "tplratio_ismfit": "no",
+            "firstpass": {
+                "largegridstep": "0.001",
+                "tplratio_ismfit": "no",
+                "multiplecontinuumfit_disable": "yes",
+                "fittingmethod": "individual"
+            },
+            "continuumfitcount": "1",
+            "continuumfitignorelinesupport": "no",
+            "stronglinesprior": "-1",
+            "euclidnhaemittersStrength": "-1",
+            "extremacutprobathreshold": "30"
         }
     },
-    "dtreepathnum": "0"
+    "enablestellarsolve": "no",
+    "calibrationDir": "\/home\/aschmitt\/amazed_cluster\/calibration\/",
+    "SaveIntermediateResults": "default",
+    "linemeascatalog": "",
+    "autocorrectinput": "no"
 }

setup.py

@@ -44,6 +44,9 @@
           'Topic :: Scientific/Engineering :: Physics'
       ],
       include_package_data=True,
+      package_data={
+         'drp_1dpipe': ['io/conf/*', 'io/auxdir/*'],
+         },
       entry_points=entry_points,
       python_requires='>=' + __minimum_python_version__,
       tests_require=['pytest']