Merge pull request #13 from yetkinyilmaz/master

changed hit printing
LAL · Jan 31, 2017 · b2dc910 · b2dc910
2 parents b6f16d6 + 54e7a2b
commit b2dc910
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 5 deletions.
diff --git a/Analysis/__init__.py b/Analysis/__init__.py
@@ -0,0 +1 @@
+
diff --git a/Generation/__init__.py b/Generation/__init__.py
@@ -0,0 +1 @@
+
diff --git a/oogenerateDetectors.py → Generation/oogenerateDetectors.py b/oogenerateDetectors.py → Generation/oogenerateDetectors.py
diff --git a/oogenerateHits.py → Generation/oogenerateHits.py b/oogenerateHits.py → Generation/oogenerateHits.py
@@ -45,6 +45,5 @@ def plotHit(self):
 
     def printHit(self, dataset = False):
         """ print hit to stdout """
-        if dataset and self.detpos != 0 and self.detpos != 1: 
-            print(self.hbc, ', ?,', list(self.lhit), sep='')
-        else: print(self.hbc, ',', self.pbc, ',', list(self.lhit), sep='')
+        if dataset:
+            print(self.hbc, ',', self.pbc, ',', list(self.lhit), sep='')
diff --git a/oogenerateParticles.py → Generation/oogenerateParticles.py b/oogenerateParticles.py → Generation/oogenerateParticles.py
diff --git a/particleController.py → Generation/particleController.py b/particleController.py → Generation/particleController.py
diff --git a/README.md b/README.md
@@ -11,13 +11,15 @@ oogenerateDetectors.py - Detector data type and methods
 
 Rest is either test code or helper code. 
 
+Please do not commit data files to the repo. 
 Please add to your .gitignore:
 
 *~
 .*
 *.csv
 *.pyc
 *.txt
+*.zip
 
 
 
diff --git a/Reconstruction/__init__.py b/Reconstruction/__init__.py
@@ -0,0 +1 @@
+
diff --git a/__init__.py b/__init__.py
@@ -0,0 +1 @@
+
diff --git a/build_datasets.py b/build_datasets.py
@@ -8,7 +8,7 @@
 
 import os
 import sys
-import particleController as pc
+import Generation.particleController as pc
 
 def createDataset(n):
     #first and second datasets
@@ -35,4 +35,4 @@ def createDataset(n):
     os.system("mkdir data_results")
     os.system("mv hits_train_soln.txt particle_valid_soln.txt particle_test_soln.txt data_results")
 
-createDataset(10)
+createDataset(10)