X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=django_simple%2Ftodo%2Fmodels.py;h=4238af6552139ebb7c1b09693334f95c31a2fe96;hb=b7e3edd4b0cc9993043cdf3d7307e8df5e01bc86;hp=295a84ac6877ce45e97bc5512af2a42f32e2b5e8;hpb=97470af3cbbcdc8f6bf92fdc92c33f14cccae170;p=django_unres.git

diff --git a/django_simple/todo/models.py b/django_simple/todo/models.py
index 295a84a..4238af6 100644
--- a/django_simple/todo/models.py
+++ b/django_simple/todo/models.py
@@ -9,6 +9,7 @@ import json
 MIN_CHOICE = (('minimize cart','minimize'),('minimize regular','regularize'),('minimize softreg','soft regularize'),('minimize','minimize internal coordinates'))
 MD_START= (('extconf','extended chain'),('pdbstart','start from pdb'),('rand_conf','random chain'))
 MD_LANG = (('langevin','Langevin'),('berendsen','Berendsen'))
+FF_CHOICE = (('FF2','FF2 = JCC 30 2127 (2009) + JCTC 11 817-831 (2015)'),('opt-wtfsa-2','OPT-WTFSA-2 = JCIM 57 2364-2377 (2017)'))
 
 logger = logging.getLogger(__name__)
 
@@ -16,6 +17,10 @@ def user_directory_path(instance, filename):
     # file will be uploaded to MEDIA_ROOT/<jobdirname>/plik.pdb
     return '{0}/{1}'.format(instance.jobdirname, 'plik.pdb')
 
+def user_directory_path2(instance, filename):
+    # file will be uploaded to MEDIA_ROOT/<jobdirname>/plik2.pdb
+    return '{0}/{1}'.format(instance.jobdirname, 'plik2.pdb')
+
 
 # Create your models here.
 class Task(models.Model):
@@ -23,11 +28,13 @@ class Task(models.Model):
     name = models.TextField(max_length=100)
     
     ssbond = models.TextField(max_length=2000,default='')
-    def setssbond(self,x):
-       self.ssbond = json.dumps(x)
-    def getssbond(self):
-       return json.loads(self.ssbond)
+#    def setssbond(self,x):
+#       self.ssbond = json.dumps(x)
+#    def getssbond(self):
+#       return json.loads(self.ssbond)
 
+    unres_ff = models.CharField(max_length=20,choices=FF_CHOICE,default='FF2')
+    pdbcode = models.CharField(max_length=6,default='')
 # minimization
     min_choice = models.CharField(max_length=20,choices=MIN_CHOICE,default='minimize cart')
     min_overlap = models.BooleanField(default=False)
@@ -37,6 +44,9 @@ class Task(models.Model):
     min_pdbout = models.BooleanField(default=True)
     myfile1 = models.FileField(default='',upload_to=user_directory_path)    
     min_unres_pdb = models.BooleanField(default=False)
+    boxx = models.FloatField(default=1000.0)
+    boxy = models.FloatField(default=1000.0)
+    boxz = models.FloatField(default=1000.0)
 
 # minimization output
     etot = models.FloatField(default=0)
@@ -57,8 +67,10 @@ class Task(models.Model):
     md_lang = models.CharField(max_length=10,choices=MD_LANG,default='langevin')
     md_tau = models.FloatField(default=1.0)
     md_scal_fric = models.FloatField(default=0.02)
-    md_mdpdb = models.BooleanField(default=False)
+    md_mdpdb = models.BooleanField(default=True)
     md_seq = models.TextField(max_length=2000,default='')
+    md_2d = models.TextField(max_length=2000,default='')
+    md_total_steps = models.IntegerField(default=200000)
     
 #remd
     remd_nrep = models.IntegerField(default=8)
@@ -73,6 +85,15 @@ class Task(models.Model):
     remd_model3 = models.TextField(default='')
     remd_model4 = models.TextField(default='')
     remd_model5 = models.TextField(default='')
+
+#saxs
+    scal_rad = models.FloatField(default=1.0)
+    wsaxs = models.FloatField(default=1000.0)
+    saxs_data = models.TextField(max_length=10000,default='')
+
+#dock
+    myfile2 = models.FileField(default='',upload_to=user_directory_path2)        
+    pdbcode2 = models.CharField(max_length=6,default='')
     
 # system    
     ready = models.BooleanField(default=False)
@@ -82,6 +103,8 @@ class Task(models.Model):
     owner = models.ForeignKey(User,default=1)
     created_date = models.DateTimeField(default=timezone.now)
     jobdirname = models.CharField(max_length=100,default='')
+    example = models.CharField(max_length=10,default='')
+    damino = models.BooleanField(default=False)
     
     def __str__(self):
         if self.done: