X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=django_simple%2Ftodo%2Fmodels.py;h=765e3c635b36ccaf09b99ac1f99f9694b22599f8;hb=a3b7f27a81cf442cdeeaff5b9c9b52298c282f5a;hp=b2ad1c37e4695fd093d12ab9e1515c1f6d840942;hpb=591ac48194b207c02ffd7cda59c1c9709a114498;p=django_unres.git

diff --git a/django_simple/todo/models.py b/django_simple/todo/models.py
index b2ad1c3..765e3c6 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__)
 
@@ -23,11 +24,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 +40,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)
@@ -59,6 +65,7 @@ class Task(models.Model):
     md_scal_fric = models.FloatField(default=0.02)
     md_mdpdb = models.BooleanField(default=False)
     md_seq = models.TextField(max_length=2000,default='')
+    md_2d = models.TextField(max_length=2000,default='')
     
 #remd
     remd_nrep = models.IntegerField(default=8)
@@ -68,6 +75,17 @@ class Task(models.Model):
 #    remd_traj1file = models.BooleanField(default=True)
 #    remd_rest1file = models.BooleanField(default=True)
     remd_cluter_temp = models.FloatField(default=280) 
+    remd_model1 = models.TextField(default='')
+    remd_model2 = models.TextField(default='')
+    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='')
+        
     
 # system    
     ready = models.BooleanField(default=False)
@@ -77,6 +95,7 @@ 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='')
     
     def __str__(self):
         if self.done: